diff -Nru cairo-dock-2.0.3/configure cairo-dock-2.0.5/configure --- cairo-dock-2.0.3/configure 2009-05-23 02:55:10.000000000 +0200 +++ cairo-dock-2.0.5/configure 2009-06-10 02:31:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for cairo-dock 2.0.3. +# Generated by GNU Autoconf 2.63 for cairo-dock 2.0.5. # # Report bugs to . # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='cairo-dock' PACKAGE_TARNAME='cairo-dock' -PACKAGE_VERSION='2.0.3' -PACKAGE_STRING='cairo-dock 2.0.3' +PACKAGE_VERSION='2.0.5' +PACKAGE_STRING='cairo-dock 2.0.5' PACKAGE_BUGREPORT='Fabrice Rey (fabounet@users.berlios.de)' ac_unique_file="config.h.in" @@ -1508,7 +1508,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cairo-dock 2.0.3 to adapt to many kinds of systems. +\`configure' configures cairo-dock 2.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1578,7 +1578,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cairo-dock 2.0.3:";; + short | recursive ) echo "Configuration of cairo-dock 2.0.5:";; esac cat <<\_ACEOF @@ -1691,7 +1691,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cairo-dock configure 2.0.3 +cairo-dock configure 2.0.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1705,7 +1705,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cairo-dock $as_me 2.0.3, which was +It was created by cairo-dock $as_me 2.0.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2425,7 +2425,7 @@ # Define the identity of the package. PACKAGE='cairo-dock' - VERSION='2.0.3' + VERSION='2.0.5' cat >>confdefs.h <<_ACEOF @@ -14815,7 +14815,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cairo-dock $as_me 2.0.3, which was +This file was extended by cairo-dock $as_me 2.0.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14878,7 +14878,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -cairo-dock config.status 2.0.3 +cairo-dock config.status 2.0.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru cairo-dock-2.0.3/configure.ac cairo-dock-2.0.5/configure.ac --- cairo-dock-2.0.3/configure.ac 2009-05-21 02:45:49.000000000 +0200 +++ cairo-dock-2.0.5/configure.ac 2009-06-10 02:16:51.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([cairo-dock], [2.0.3], [Fabrice Rey (fabounet@users.berlios.de)]) +AC_INIT([cairo-dock], [2.0.5], [Fabrice Rey (fabounet@users.berlios.de)]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff -Nru cairo-dock-2.0.3/data/cairo-dock.conf cairo-dock-2.0.5/data/cairo-dock.conf --- cairo-dock-2.0.3/data/cairo-dock.conf 2009-05-23 02:55:19.000000000 +0200 +++ cairo-dock-2.0.5/data/cairo-dock.conf 2009-06-10 02:32:10.000000000 +0200 @@ -1,4 +1,4 @@ -#!en;2.0.3 +#!en;2.0.5 ######## This is the conf file of cairo-dock, released under the GPL.########## ######## It is parsed by cairo-dock to automatically generate an appropriate GUI,########## ######## so don't mess into it, except if you know what you're doing ! ;-)########## @@ -131,7 +131,7 @@ #s- Except the following classes : #{enter the class of the applications, separated by a semi-colon ';'} -overwrite exception = pidgin;xchat;gimp +overwrite exception = pidgin;xchat;gimp-2.6 #b- Show a window thumbnail when it's minimized ? #{You need a composite manager for it.} diff -Nru cairo-dock-2.0.3/data/cairo-dock.conf.in cairo-dock-2.0.5/data/cairo-dock.conf.in --- cairo-dock-2.0.3/data/cairo-dock.conf.in 2009-05-21 02:19:48.000000000 +0200 +++ cairo-dock-2.0.5/data/cairo-dock.conf.in 2009-06-08 01:14:02.000000000 +0200 @@ -131,7 +131,7 @@ #s- Except the following classes : #{enter the class of the applications, separated by a semi-colon ';'} -overwrite exception = pidgin;xchat;gimp +overwrite exception = pidgin;xchat;gimp-2.6 #b- Show a window thumbnail when it's minimized ? #{You need a composite manager for it.} diff -Nru cairo-dock-2.0.3/data/ChangeLog.txt cairo-dock-2.0.5/data/ChangeLog.txt --- cairo-dock-2.0.3/data/ChangeLog.txt 2009-05-23 01:57:02.000000000 +0200 +++ cairo-dock-2.0.5/data/ChangeLog.txt 2009-06-10 02:16:19.000000000 +0200 @@ -35,4 +35,4 @@ 2.0.0 = Cairo-Dock II\n - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still available for old graphic cards or ATI)\n - New plug-ins provide many visual affects : Animated icons, icon effects, illusion, drop indicator, motion blur, dialog rendering\n - The config panel has been widely rewritten.\n - Desklets are now in 3D\n - New applets : mail, keyboard indicator, quick folder, Toons.\n - Lot of bug fixes and upgrades in all plug-ins. -2.0.3 = Cairo-Dock II\n - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still available for old graphic cards or ATI)\n - New plug-ins provide many visual affects : Animated icons, icon effects, illusion, drop indicator, motion blur, dialog rendering\n - The config panel has been widely rewritten.\n - Desklets are now in 3D\n - New applets : mail, keyboard indicator, quick folder, Toons.\n - Lot of bug fixes and upgrades in all plug-ins.\n - 2.0.3 : some bug fixes + improvment of the config panel. +2.0.5 = 2.0.5 :\n - This is mainly a bug-fix version\n - improvment in the RB applet\n - Added functionnalities on grouped applications icons. diff -Nru cairo-dock-2.0.3/data/default-icon-appli.svg cairo-dock-2.0.5/data/default-icon-appli.svg --- cairo-dock-2.0.3/data/default-icon-appli.svg 1970-01-01 01:00:00.000000000 +0100 +++ cairo-dock-2.0.5/data/default-icon-appli.svg 2009-05-28 01:45:22.000000000 +0200 @@ -0,0 +1,177 @@ + + + diff -Nru cairo-dock-2.0.3/data/default-icon.svg cairo-dock-2.0.5/data/default-icon.svg --- cairo-dock-2.0.3/data/default-icon.svg 2009-01-31 05:37:27.000000000 +0100 +++ cairo-dock-2.0.5/data/default-icon.svg 2009-05-28 02:17:58.000000000 +0200 @@ -2,230 +2,416 @@ diff -Nru cairo-dock-2.0.3/data/default-theme/cairo-dock.conf cairo-dock-2.0.5/data/default-theme/cairo-dock.conf --- cairo-dock-2.0.3/data/default-theme/cairo-dock.conf 2009-05-23 00:57:51.000000000 +0200 +++ cairo-dock-2.0.5/data/default-theme/cairo-dock.conf 2009-06-07 02:32:34.000000000 +0200 @@ -34,11 +34,6 @@ xinerama=false #i[0;12] Number of the screen where the dock should be located : #{starting from 0} -# -# -# -# -# num screen=0 @@ -282,7 +277,7 @@ #{Only use this if you don't run a composite manager like Compiz, xcompmgr, etc and have a black background around your dock. For esthetic reason, the dock will be kept under other windows.} fake transparency=false -modules=switcher;ram-meter;Scooby-Do;dialog rendering;drop indicator;Cairo-Penguin;shortcuts;illusion;logout;cpusage;weather;showDesktop;dock rendering;clock;Animated icons;dustbin;icon effects;GMenu +modules=switcher;ram-meter;Scooby-Do;dialog rendering;drop indicator;shortcuts;illusion;logout;cpusage;weather;showDesktop;dock rendering;clock;Animated icons;dustbin;icon effects;GMenu #/usr/share/cairo-dock/icon-hidden-dock.png;1;Define the appearance of the dock when it's hidden. @@ -396,7 +391,7 @@ #c+4[0;1] Color of the label's background : #{If you set it to fully transparent, there will be no background for the text, but the letters' outline will be thicker.} -text background color=0;0;0;6.9388939039072284e-17; +text background color=0;0;0;0; #i+[0;20] Margin around the text (in pixels) : text margin=4 diff -Nru cairo-dock-2.0.3/data/default-theme/plug-ins/rame/rame.conf cairo-dock-2.0.5/data/default-theme/plug-ins/rame/rame.conf --- cairo-dock-2.0.3/data/default-theme/plug-ins/rame/rame.conf 2009-05-09 03:07:07.000000000 +0200 +++ cairo-dock-2.0.5/data/default-theme/plug-ins/rame/rame.conf 2009-06-07 03:53:43.000000000 +0200 @@ -117,7 +117,7 @@ bg color=0.5;0.5;1;0.40000000000000002; #h+[/usr/share/cairo-dock/gauges;gauges;gauges] List of available themes for the gauge : -theme=turbo-night-fuel +theme=Turbo-night-fuel #v sep1= diff -Nru cairo-dock-2.0.3/data/default-theme/plug-ins/rendering/rendering.conf cairo-dock-2.0.5/data/default-theme/plug-ins/rendering/rendering.conf --- cairo-dock-2.0.3/data/default-theme/plug-ins/rendering/rendering.conf 2009-05-08 21:03:30.000000000 +0200 +++ cairo-dock-2.0.5/data/default-theme/plug-ins/rendering/rendering.conf 2009-05-31 03:21:23.000000000 +0200 @@ -84,13 +84,13 @@ [SimpleSlide] #i+[10;100] Space between columns : -simple_iconGapX=70 +simple_iconGapX=60 #i+[15;100] Space between rows : simple_iconGapY=50 #e+[0;5] Max size of icons : -simple_fScaleMax=2.5 +simple_fScaleMax=2. #i+[50;1000] Sinusoidal wave radius : simple_sinW=200 diff -Nru cairo-dock-2.0.3/data/help.conf cairo-dock-2.0.5/data/help.conf --- cairo-dock-2.0.3/data/help.conf 2009-05-10 02:16:19.000000000 +0200 +++ cairo-dock-2.0.5/data/help.conf 2009-06-04 01:29:22.000000000 +0200 @@ -147,7 +147,7 @@ #> Use the “Mix applis and launchers” option. #When a program is launched, if it has a launcher in the dock, this one will take an indicator to signal you that the corresponding application is running. #You can then act on the window as if it was a taskbar icon. -#{Hint : to launch another instance of theprogram, shift+click on the launcher.} +#{Hint : to launch another instance of the program, shift+click on the launcher.} mix= #X [I’m using Pidgin, and I want to see my friends’ avatar] Xnot overwrite= @@ -155,9 +155,9 @@ #If you choosed to mix applis and launchers, you can edit the Pidgin launcher, # and in the “Extra parameters”, tick the box that says to not steal the icon for this appli. not overwrite= -#X How can I quickly navigate between many windows of the same application ?] +#X [How can I quickly navigate between many windows of the same application ?] Xalt-tab= -#>Scroll on the icon of one of the windows of this appli, or even on the icon pointing on the sub-dock if you group windows in a sub-dock. +#> Scroll on the icon of one of the windows of this appli, or even on the icon pointing on the sub-dock if you group windows in a sub-dock. #{Hint : you can also close all the windows of this appli by middle-clicking on the icon pointing on the sub-dock.} alt-tab= @@ -253,27 +253,26 @@ Xblack= #> You have to turn on the compositing. For instance, you can run Compiz or xcompmgr. #If you’re under XFCE or KDE, you can just activate the compositing in the window manager’s options. +#{Hint : If yo have an ATI or an Intel, you should try without OpenGL first, because their drivers are not yet perfect.} black= #X [My machine is too old to run a composite manager] Xfake= #> Don’t panic, Cairo-Dock can emulate the transparency. #So to get rid of the black background, just activate the corresponding option, in the end of the “System” module fake= - #X [The dock is horribly slow when I move the mouse into it] Xslow= #> If you have a GeForce8, you have to install the latest drivers, because the first ones were really buggy. #If the dock is running without openGL, try to reduce the number of icons in the main dock, or try to reduce its size. #If the dock is running with openGL, try to deactivate it by launching the dock with “cairo-dock –c”. -#{Hint : } slow= #X [I don’t have these wonderful effects like fire, cube rotating, etc] Xeff= -#v -sep= #> You need a graphic card with drivers that support openGL2.0. Most of Nvidia cards can do that, more and more Intel cards can do too. Most of ATI cards can’t do that. #{Hint : You can force the openGL by launching the dock with “cairo-dock –o”.but you might get a lot of visual artifacts.} eff= +#v +sep= #X [The “netspeed” applet displays 0 even when I’m downloading something] Xnetspeed= #> You have to tell it which interface you’re using to connect to the Net (by default, it’s “eth0”). diff -Nru cairo-dock-2.0.3/data/launcher.conf cairo-dock-2.0.5/data/launcher.conf --- cairo-dock-2.0.3/data/launcher.conf 2009-05-16 20:59:46.000000000 +0200 +++ cairo-dock-2.0.5/data/launcher.conf 2009-05-31 01:05:30.000000000 +0200 @@ -24,6 +24,7 @@ StartupWMClass = #b Run in a terminal ? +#{It will use 'xterm'.} Terminal = false Is container = false diff -Nru cairo-dock-2.0.3/data/main-dock.conf cairo-dock-2.0.5/data/main-dock.conf --- cairo-dock-2.0.3/data/main-dock.conf 2009-05-23 02:55:19.000000000 +0200 +++ cairo-dock-2.0.5/data/main-dock.conf 2009-06-10 02:32:10.000000000 +0200 @@ -1,4 +1,4 @@ -#!en;2.0.3 +#!en;2.0.5 ######## This is the conf file of main docks.########## ######## It is parsed by cairo-dock to automatically generate an appropriate GUI,########## ######## so don't mess into it, except if you know what you're doing ! ;-)########## diff -Nru cairo-dock-2.0.3/data/Makefile.am cairo-dock-2.0.5/data/Makefile.am --- cairo-dock-2.0.3/data/Makefile.am 2009-04-08 01:59:11.000000000 +0200 +++ cairo-dock-2.0.5/data/Makefile.am 2009-05-28 01:51:14.000000000 +0200 @@ -11,6 +11,7 @@ themes.conf\ main-dock.conf\ default-icon.svg\ + default-icon-appli.svg\ default-indicator.png\ default-class-indicator.svg\ cairo-dock-ok.svg\ diff -Nru cairo-dock-2.0.3/data/Makefile.in cairo-dock-2.0.5/data/Makefile.in --- cairo-dock-2.0.3/data/Makefile.in 2009-05-23 02:55:12.000000000 +0200 +++ cairo-dock-2.0.5/data/Makefile.in 2009-06-10 02:31:59.000000000 +0200 @@ -219,6 +219,7 @@ themes.conf\ main-dock.conf\ default-icon.svg\ + default-icon-appli.svg\ default-indicator.png\ default-class-indicator.svg\ cairo-dock-ok.svg\ diff -Nru cairo-dock-2.0.3/debian/changelog cairo-dock-2.0.5/debian/changelog --- cairo-dock-2.0.3/debian/changelog 2009-06-21 01:18:24.000000000 +0200 +++ cairo-dock-2.0.5/debian/changelog 2009-06-21 01:18:24.000000000 +0200 @@ -1,3 +1,14 @@ +cairo-dock (2.0.5-0ubuntu1) karmic; urgency=low + + * New Upstream Version. + * debian/rules: + - Drop autoreconf call, it's fixed upstream. + - Call dh_desktop for all desktop files. + * debian/control: + - Add libgtkglext1-dev as depends for cairo-dock-dev. + + -- Julien Lavergne Sat, 20 Jun 2009 23:46:54 +0200 + cairo-dock (2.0.3-0ubuntu1) karmic; urgency=low [ Andrew Starr-Bochicchio ] diff -Nru cairo-dock-2.0.3/debian/control cairo-dock-2.0.5/debian/control --- cairo-dock-2.0.3/debian/control 2009-06-21 01:18:24.000000000 +0200 +++ cairo-dock-2.0.5/debian/control 2009-06-21 01:18:24.000000000 +0200 @@ -40,7 +40,8 @@ ${misc:Depends}, libdbus-glib-1-dev, libxml2-dev, - librsvg2-dev + librsvg2-dev, + libgtkglext1-dev Description: Development files for cairo-dock Uses cairo to render nice graphics, and Glitz to use hardware acceleration. It's fully configurable and can be a taskbar too. diff -Nru cairo-dock-2.0.3/debian/rules cairo-dock-2.0.5/debian/rules --- cairo-dock-2.0.3/debian/rules 2009-06-21 01:18:24.000000000 +0200 +++ cairo-dock-2.0.5/debian/rules 2009-06-21 01:18:24.000000000 +0200 @@ -7,15 +7,12 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -makebuilddir:: - cd $(DEB_BUILDDIR); autoreconf -f -i - DEB_INSTALL_MANPAGES_cairo-dock := debian/cairo-dock.1 DEB_INSTALL_CHANGELOGS_ALL := data/ChangeLog.txt binary-predeb/cairo-dock:: - dh_desktop debian/cairo-dock.desktop + dh_desktop debian/*.desktop get-orig-source: dh_testdir diff -Nru cairo-dock-2.0.3/po/cairo-dock.pot cairo-dock-2.0.5/po/cairo-dock.pot --- cairo-dock-2.0.3/po/cairo-dock.pot 2009-05-23 02:54:58.000000000 +0200 +++ cairo-dock-2.0.5/po/cairo-dock.pot 2009-06-10 02:31:41.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: fabounet@users.berlios.de\n" -"POT-Creation-Date: 2009-05-23 02:54+0200\n" +"POT-Creation-Date: 2009-06-10 02:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,14 +16,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/cairo-dock-callbacks.c:1184 +#: ../src/cairo-dock-callbacks.c:1181 msgid "Do you want to mount this point ?" msgstr "" -#: ../src/cairo-dock-callbacks.c:1773 -msgid "Quit Cairo-Dock ?" -msgstr "" - #: ../src/cairo-dock-desktop-file-factory.c:158 msgid "Do you want to monitor the content of the directory ?" msgstr "" @@ -72,99 +68,99 @@ "features." msgstr "" -#: ../src/cairo-dock-gui-factory.c:715 +#: ../src/cairo-dock-gui-factory.c:722 #, c-format msgid "" "The '%s' plug-in is not active.\n" "Be sure to activate it to enjoy these features." msgstr "" -#: ../src/cairo-dock-gui-factory.c:1710 +#: ../src/cairo-dock-gui-factory.c:1719 msgid "grab" msgstr "" -#: ../src/cairo-dock-gui-manager.c:72 ../data/messages:89 +#: ../src/cairo-dock-gui-manager.c:73 ../data/messages:89 msgid "Behaviour" msgstr "" -#: ../src/cairo-dock-gui-manager.c:73 +#: ../src/cairo-dock-gui-manager.c:74 msgid "Appearance" msgstr "" -#: ../src/cairo-dock-gui-manager.c:74 +#: ../src/cairo-dock-gui-manager.c:75 msgid "Accessories" msgstr "" -#: ../src/cairo-dock-gui-manager.c:75 +#: ../src/cairo-dock-gui-manager.c:76 msgid "Desktop" msgstr "" -#: ../src/cairo-dock-gui-manager.c:76 +#: ../src/cairo-dock-gui-manager.c:77 msgid "Controlers" msgstr "" -#: ../src/cairo-dock-gui-manager.c:77 +#: ../src/cairo-dock-gui-manager.c:78 msgid "Plug-ins" msgstr "" -#: ../src/cairo-dock-gui-manager.c:406 +#: ../src/cairo-dock-gui-manager.c:407 msgid "Categories" msgstr "" -#: ../src/cairo-dock-gui-manager.c:427 +#: ../src/cairo-dock-gui-manager.c:428 msgid "All" msgstr "" -#: ../src/cairo-dock-gui-manager.c:533 +#: ../src/cairo-dock-gui-manager.c:534 msgid "Activate this module" msgstr "" -#: ../src/cairo-dock-gui-manager.c:551 +#: ../src/cairo-dock-gui-manager.c:552 msgid "Filter" msgstr "" -#: ../src/cairo-dock-gui-manager.c:591 +#: ../src/cairo-dock-gui-manager.c:592 msgid "All words" msgstr "" -#: ../src/cairo-dock-gui-manager.c:598 +#: ../src/cairo-dock-gui-manager.c:599 msgid "Highlight words" msgstr "" -#: ../src/cairo-dock-gui-manager.c:606 +#: ../src/cairo-dock-gui-manager.c:607 msgid "Hide others" msgstr "" -#: ../src/cairo-dock-gui-manager.c:614 +#: ../src/cairo-dock-gui-manager.c:615 msgid "Search in description" msgstr "" -#: ../src/cairo-dock-gui-manager.c:677 +#: ../src/cairo-dock-gui-manager.c:686 msgid "< Maintenance mode >" msgstr "" -#: ../src/cairo-dock-gui-manager.c:695 ../src/cairo-dock-gui-manager.c:766 +#: ../src/cairo-dock-gui-manager.c:704 ../src/cairo-dock-gui-manager.c:775 msgid "Configuration of Cairo-Dock" msgstr "" -#: ../src/cairo-dock-gui-manager.c:1004 +#: ../src/cairo-dock-gui-manager.c:1013 #, c-format msgid "" "The module '%s' is not present. You need to install it or its dependencies " "to make the most of this module." msgstr "" -#: ../src/cairo-dock-gui-manager.c:1010 +#: ../src/cairo-dock-gui-manager.c:1019 #, c-format msgid "The module '%s' is not activated." msgstr "" -#: ../src/cairo-dock-gui-manager.c:1011 +#: ../src/cairo-dock-gui-manager.c:1020 msgid "Do you want to activate it now ?" msgstr "" #: ../src/cairo-dock-internal-accessibility.c:170 -#: ../src/cairo-dock-menu.c:1409 ../data/messages:39 +#: ../src/cairo-dock-menu.c:1562 ../data/messages:39 msgid "Accessibility" msgstr "" @@ -210,16 +206,16 @@ msgid "Define the appearance of the dock when it's hidden." msgstr "" -#: ../src/cairo-dock-internal-icons.c:337 +#: ../src/cairo-dock-internal-icons.c:348 msgid "It provides many animations to your icons." msgstr "" -#: ../src/cairo-dock-internal-icons.c:339 ../data/messages:355 +#: ../src/cairo-dock-internal-icons.c:350 ../data/messages:355 #: ../data/messages:665 msgid "Icons" msgstr "" -#: ../src/cairo-dock-internal-icons.c:341 +#: ../src/cairo-dock-internal-icons.c:352 msgid "" "All about icons :\n" " size, reflection, icon theme, ..." @@ -241,12 +237,12 @@ msgid "Define the style of the icons' labels and quick-info." msgstr "" -#: ../src/cairo-dock-internal-position.c:95 ../data/messages:1 -#: ../data/messages:977 +#: ../src/cairo-dock-internal-position.c:96 ../data/messages:1 +#: ../data/messages:981 msgid "Position" msgstr "" -#: ../src/cairo-dock-internal-position.c:97 +#: ../src/cairo-dock-internal-position.c:98 msgid "Set the position of the main dock." msgstr "" @@ -280,43 +276,47 @@ msgid "Select a view for each of your docks." msgstr "" -#: ../src/cairo-dock-menu.c:142 +#: ../src/cairo-dock-menu.c:139 msgid "Development" msgstr "" -#: ../src/cairo-dock-menu.c:148 +#: ../src/cairo-dock-menu.c:145 msgid "Artwork" msgstr "" -#: ../src/cairo-dock-menu.c:152 +#: ../src/cairo-dock-menu.c:149 msgid "Support" msgstr "" -#: ../src/cairo-dock-menu.c:237 +#: ../src/cairo-dock-menu.c:231 +msgid "Quit Cairo-Dock ?" +msgstr "" + +#: ../src/cairo-dock-menu.c:246 msgid "" "Do you want to re-dispatch the icons contained inside this container into " "the dock ?\n" " (otherwise they will be destroyed)" msgstr "" -#: ../src/cairo-dock-menu.c:258 +#: ../src/cairo-dock-menu.c:267 #, c-format msgid "You're about removing this icon (%s) from the dock. Sure ?" msgstr "" -#: ../src/cairo-dock-menu.c:314 +#: ../src/cairo-dock-menu.c:323 msgid "Fill this launcher" msgstr "" -#: ../src/cairo-dock-menu.c:326 +#: ../src/cairo-dock-menu.c:335 msgid "Undefined" msgstr "" -#: ../src/cairo-dock-menu.c:478 ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:487 ../src/cairo-dock-menu.c:1448 msgid "Modify this launcher" msgstr "" -#: ../src/cairo-dock-menu.c:620 +#: ../src/cairo-dock-menu.c:629 #, c-format msgid "" "You're about deleting this file\n" @@ -324,17 +324,17 @@ "from your hard-disk. Sure ?" msgstr "" -#: ../src/cairo-dock-menu.c:629 +#: ../src/cairo-dock-menu.c:638 msgid "" "Attention : couldn't delete this file.\n" "Check that you have writing rights on it." msgstr "" -#: ../src/cairo-dock-menu.c:653 +#: ../src/cairo-dock-menu.c:662 msgid "Rename to :" msgstr "" -#: ../src/cairo-dock-menu.c:660 +#: ../src/cairo-dock-menu.c:669 #, c-format msgid "" "Attention : couldn't rename %s.\n" @@ -342,297 +342,327 @@ " and that the new name does not already exist." msgstr "" -#: ../src/cairo-dock-menu.c:705 +#: ../src/cairo-dock-menu.c:714 #, c-format msgid "You're about removing this applet (%s) from the dock. Sure ?" msgstr "" -#: ../src/cairo-dock-menu.c:1034 +#: ../src/cairo-dock-menu.c:840 +msgid "" +"Sorry, couldn't find the corresponding description file.\n" +"Consider drag and dropping the launcher from the Applications Menu." +msgstr "" + +#: ../src/cairo-dock-menu.c:1166 #, c-format msgid "Set position for the dock '%s'" msgstr "" -#: ../src/cairo-dock-menu.c:1117 +#: ../src/cairo-dock-menu.c:1249 msgid "Configure" msgstr "" -#: ../src/cairo-dock-menu.c:1124 +#: ../src/cairo-dock-menu.c:1256 msgid "Set up this dock" msgstr "" -#: ../src/cairo-dock-menu.c:1126 +#: ../src/cairo-dock-menu.c:1258 msgid "Manage themes" msgstr "" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "unlock icons" msgstr "" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "lock icons" msgstr "" -#: ../src/cairo-dock-menu.c:1139 +#: ../src/cairo-dock-menu.c:1271 msgid "Quick-Hide" msgstr "" -#: ../src/cairo-dock-menu.c:1147 +#: ../src/cairo-dock-menu.c:1279 msgid "Launch Cairo-Dock on startup" msgstr "" -#: ../src/cairo-dock-menu.c:1153 +#: ../src/cairo-dock-menu.c:1285 msgid "Development's site" msgstr "" -#: ../src/cairo-dock-menu.c:1155 +#: ../src/cairo-dock-menu.c:1287 msgid "Community's site" msgstr "" -#: ../src/cairo-dock-menu.c:1157 +#: ../src/cairo-dock-menu.c:1289 msgid "Help" msgstr "" -#: ../src/cairo-dock-menu.c:1159 +#: ../src/cairo-dock-menu.c:1291 msgid "About" msgstr "" -#: ../src/cairo-dock-menu.c:1163 +#: ../src/cairo-dock-menu.c:1295 msgid "Quit" msgstr "" -#: ../src/cairo-dock-menu.c:1191 ../src/cairo-dock-menu.c:1253 +#: ../src/cairo-dock-menu.c:1315 +#, c-format +msgid "Move all to desktop %d - face %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1315 +#, c-format +msgid "Move to desktop %d - face %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1317 +#, c-format +msgid "Move all to desktop %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1317 +#, c-format +msgid "Move to desktop %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1319 +#, c-format +msgid "Move all to face %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1319 +#, c-format +msgid "Moveto face %d" +msgstr "" + +#: ../src/cairo-dock-menu.c:1368 ../src/cairo-dock-menu.c:1430 msgid "Add a manual launcher" msgstr "" -#: ../src/cairo-dock-menu.c:1192 ../src/cairo-dock-menu.c:1254 +#: ../src/cairo-dock-menu.c:1369 ../src/cairo-dock-menu.c:1431 msgid "" "Don't forget you can drag a launcher from the menu and drop it in the dock !" msgstr "" -#: ../src/cairo-dock-menu.c:1194 ../src/cairo-dock-menu.c:1256 +#: ../src/cairo-dock-menu.c:1371 ../src/cairo-dock-menu.c:1433 msgid "Add a sub-dock" msgstr "" -#: ../src/cairo-dock-menu.c:1198 ../src/cairo-dock-menu.c:1260 +#: ../src/cairo-dock-menu.c:1375 ../src/cairo-dock-menu.c:1437 msgid "Add a separator" msgstr "" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Unmount" msgstr "" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Mount" msgstr "" -#: ../src/cairo-dock-menu.c:1224 +#: ../src/cairo-dock-menu.c:1401 msgid "Eject" msgstr "" -#: ../src/cairo-dock-menu.c:1231 +#: ../src/cairo-dock-menu.c:1408 msgid "Delete this file" msgstr "" -#: ../src/cairo-dock-menu.c:1235 +#: ../src/cairo-dock-menu.c:1412 msgid "Rename this file" msgstr "" -#: ../src/cairo-dock-menu.c:1239 +#: ../src/cairo-dock-menu.c:1416 msgid "Properties" msgstr "" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this separator" msgstr "" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this launcher" msgstr "" -#: ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:1448 msgid "Modify this separator" msgstr "" -#: ../src/cairo-dock-menu.c:1281 +#: ../src/cairo-dock-menu.c:1459 ../src/cairo-dock-menu.c:1503 msgid "Other actions" msgstr "" -#: ../src/cairo-dock-menu.c:1286 +#: ../src/cairo-dock-menu.c:1464 msgid "Move to this desktop" msgstr "" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Not Fullscreen" msgstr "" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Fullscreen" msgstr "" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Don't keep above" msgstr "" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Keep above" msgstr "" -#: ../src/cairo-dock-menu.c:1300 -#, c-format -msgid "Move to desktop %d - face %d" -msgstr "" - -#: ../src/cairo-dock-menu.c:1302 -#, c-format -msgid "Move to desktop %d" -msgstr "" - -#: ../src/cairo-dock-menu.c:1304 -#, c-format -msgid "Move to face %d" -msgstr "" - -#: ../src/cairo-dock-menu.c:1335 +#: ../src/cairo-dock-menu.c:1475 msgid "Kill" msgstr "" -#: ../src/cairo-dock-menu.c:1341 ../src/cairo-dock-menu.c:1365 +#: ../src/cairo-dock-menu.c:1480 ../src/cairo-dock-menu.c:1514 msgid "Launch new" msgstr "" -#: ../src/cairo-dock-menu.c:1346 +#: ../src/cairo-dock-menu.c:1485 msgid "Make it a launcher" msgstr "" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Unmaximize" msgstr "" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Maximize" msgstr "" -#: ../src/cairo-dock-menu.c:1352 +#: ../src/cairo-dock-menu.c:1491 msgid "Show" msgstr "" -#: ../src/cairo-dock-menu.c:1354 +#: ../src/cairo-dock-menu.c:1493 msgid "Minimize" msgstr "" -#: ../src/cairo-dock-menu.c:1356 +#: ../src/cairo-dock-menu.c:1495 msgid "Close" msgstr "" -#: ../src/cairo-dock-menu.c:1368 +#: ../src/cairo-dock-menu.c:1508 +msgid "Move all to this desktop" +msgstr "" + +#: ../src/cairo-dock-menu.c:1517 +msgid "Show all" +msgstr "" + +#: ../src/cairo-dock-menu.c:1519 +msgid "Minimize all" +msgstr "" + +#: ../src/cairo-dock-menu.c:1521 msgid "Close all" msgstr "" -#: ../src/cairo-dock-menu.c:1387 +#: ../src/cairo-dock-menu.c:1540 msgid "Configure this applet" msgstr "" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Detach this applet" msgstr "" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Return to dock" msgstr "" -#: ../src/cairo-dock-menu.c:1394 +#: ../src/cairo-dock-menu.c:1547 msgid "Remove this applet" msgstr "" -#: ../src/cairo-dock-menu.c:1398 +#: ../src/cairo-dock-menu.c:1551 msgid "Launch another instance of this applet" msgstr "" -#: ../src/cairo-dock-menu.c:1426 +#: ../src/cairo-dock-menu.c:1579 msgid "Normal" msgstr "" -#: ../src/cairo-dock-menu.c:1433 +#: ../src/cairo-dock-menu.c:1586 msgid "Always on top" msgstr "" -#: ../src/cairo-dock-menu.c:1440 +#: ../src/cairo-dock-menu.c:1593 msgid "Always below" msgstr "" -#: ../src/cairo-dock-menu.c:1456 +#: ../src/cairo-dock-menu.c:1606 msgid "set behaviour in Compiz to: (name=cairo-dock & type=utility)" msgstr "" -#: ../src/cairo-dock-menu.c:1458 +#: ../src/cairo-dock-menu.c:1608 msgid "Reserve space" msgstr "" -#: ../src/cairo-dock-menu.c:1465 +#: ../src/cairo-dock-menu.c:1615 msgid "On all desktops" msgstr "" -#: ../src/cairo-dock-menu.c:1471 +#: ../src/cairo-dock-menu.c:1621 msgid "Lock position" msgstr "" -#: ../src/cairo-dock-modules.c:107 +#: ../src/cairo-dock-modules.c:108 msgid "" "A useful FAQ that contains also a lot of hints.\n" "Let the mouse over a sentence to make the hint dialog popups." msgstr "" -#: ../src/cairo-dock-themes-manager.c:439 +#: ../src/cairo-dock-themes-manager.c:145 +#, c-format +msgid "Downloading file %s ..." +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:186 +#, c-format +msgid "couldn't get distant file %s" +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:468 #, c-format msgid "Are you sure you want to overwrite theme %s ?" msgstr "" -#: ../src/cairo-dock-themes-manager.c:537 +#: ../src/cairo-dock-themes-manager.c:566 #, c-format msgid "Are you sure you want to delete theme %s ?" msgstr "" -#: ../src/cairo-dock-themes-manager.c:539 +#: ../src/cairo-dock-themes-manager.c:568 msgid "Are you sure you want to delete these themes ?" msgstr "" -#: ../src/cairo-dock-themes-manager.c:601 +#: ../src/cairo-dock-themes-manager.c:630 msgid "" "You made some modifications in the current theme.\n" "You will loose them if you don't save before choosing a new theme. Continue " "anyway ?" msgstr "" -#: ../src/cairo-dock-themes-manager.c:637 +#: ../src/cairo-dock-themes-manager.c:666 #, c-format msgid "" "couldn't get distant file %s/%s, maybe the server is down.\n" "Please retry later or contact us at cairo-dock.org." msgstr "" -#: ../src/cairo-dock-themes-manager.c:807 -msgid "< Safe Mode >" -msgstr "" - -#: ../src/cairo-dock-themes-manager.c:807 +#: ../src/cairo-dock-themes-manager.c:858 msgid "Manage Themes" msgstr "" -#: ../src/cairo-dock-themes-manager.c:812 -msgid "" -"You are running Cairo-Dock in safe mode.\n" -"Why ? Probably because a plug-in has messed into your dock,\n" -" or maybe your theme has got corrupted.\n" -"So, no plug-in will be available, and you can now save your current theme if " -"you want\n" -" before you start using the dock.\n" -"Try with your current theme, if it works, it means a plug-in is wrong.\n" -"Otherwise, try with another theme.\n" -"Save a config that is working, and restart the dock in normal mode.\n" -"Then, activate plug-ins one by one to guess which one is wrong." +#: ../src/cairo-dock-themes-manager.c:902 +#, c-format +msgid "couldn't retrieve distant theme %s" msgstr "" -#: ../src/cairo-dock.c:616 +#: ../src/cairo-dock.c:608 msgid "" "Welcome in Cairo-Dock2 !\n" "A default and simple theme has been loaded.\n" @@ -645,11 +675,11 @@ " (you can now click on this dialog to close it)" msgstr "" -#: ../data/messages:3 ../data/messages:979 +#: ../data/messages:3 ../data/messages:983 msgid "Position on the screen" msgstr "" -#: ../data/messages:5 ../data/messages:981 +#: ../data/messages:5 ../data/messages:985 msgid "" "The icons will scroll according to the chosen placement type. Of course the " "dock can be placed anywhere on the screen, here we specify regarding to what." @@ -659,23 +689,23 @@ msgid "Choose which screen border the dock will placed on :" msgstr "" -#: ../data/messages:9 ../data/messages:985 +#: ../data/messages:9 ../data/messages:989 msgid "bottom" msgstr "" -#: ../data/messages:11 ../data/messages:987 +#: ../data/messages:11 ../data/messages:991 msgid "top" msgstr "" -#: ../data/messages:13 ../data/messages:989 +#: ../data/messages:13 ../data/messages:993 msgid "right" msgstr "" -#: ../data/messages:15 ../data/messages:991 +#: ../data/messages:15 ../data/messages:995 msgid "left" msgstr "" -#: ../data/messages:17 ../data/messages:993 +#: ../data/messages:17 ../data/messages:997 msgid "" "At 0, the dock will place itself regarding the left corner if horizontal and " "the top corner if vertical, at 1 regarding the right corner if horizontal " @@ -683,31 +713,31 @@ "screen's edge." msgstr "" -#: ../data/messages:19 ../data/messages:995 +#: ../data/messages:19 ../data/messages:999 msgid "Relative alignment :" msgstr "" -#: ../data/messages:21 ../data/messages:997 +#: ../data/messages:21 ../data/messages:1001 msgid "Position regarding the chosen screen's edge" msgstr "" -#: ../data/messages:23 ../data/messages:999 +#: ../data/messages:23 ../data/messages:1003 msgid "" "Gap from the absolute position on the screen's edge, in pixels. You can also " "move the dock by holding ALT or CTRL key and left mouse button." msgstr "" -#: ../data/messages:25 ../data/messages:1001 +#: ../data/messages:25 ../data/messages:1005 msgid "Lateral gap :" msgstr "" -#: ../data/messages:27 ../data/messages:1003 +#: ../data/messages:27 ../data/messages:1007 msgid "" "in pixels. You can also move the dock by holding ALT or CTRL key and left " "mouse button." msgstr "" -#: ../data/messages:29 ../data/messages:1005 +#: ../data/messages:29 ../data/messages:1009 msgid "Distance to the screen's edge :" msgstr "" @@ -763,7 +793,7 @@ "the dock and make it re-appear." msgstr "" -#: ../data/messages:55 ../data/messages:1009 +#: ../data/messages:55 ../data/messages:1013 msgid "Activate auto-hide ?" msgstr "" @@ -1924,7 +1954,7 @@ msgid "Name of an image to use for the locked emblem :" msgstr "" -#: ../data/messages:651 ../data/messages:949 ../data/messages:1011 +#: ../data/messages:651 ../data/messages:951 ../data/messages:1015 msgid "Desktop Entry" msgstr "" @@ -1932,19 +1962,19 @@ msgid "Sub-dock's name :" msgstr "" -#: ../data/messages:655 ../data/messages:957 ../data/messages:1013 +#: ../data/messages:655 ../data/messages:959 ../data/messages:1017 msgid "Image's name or path :" msgstr "" -#: ../data/messages:657 ../data/messages:963 ../data/messages:1015 +#: ../data/messages:657 ../data/messages:965 ../data/messages:1019 msgid "Extra parameters" msgstr "" -#: ../data/messages:659 ../data/messages:965 ../data/messages:1017 +#: ../data/messages:659 ../data/messages:967 ../data/messages:1021 msgid "Order you want for this launcher among the others:" msgstr "" -#: ../data/messages:661 ../data/messages:961 ../data/messages:1019 +#: ../data/messages:661 ../data/messages:963 ../data/messages:1023 msgid "Name of the container it belongs to:" msgstr "" @@ -2359,7 +2389,8 @@ #: ../data/messages:813 msgid "" -"Hint : to launch another instance of theprogram, shift+click on the launcher." +"Hint : to launch another instance of the program, shift+click on the " +"launcher." msgstr "" #: ../data/messages:815 @@ -2387,57 +2418,62 @@ #: ../data/messages:821 msgid "" +"How can I quickly navigate between many windows of the same application ?" +msgstr "" + +#: ../data/messages:823 +msgid "" "Hint : you can also close all the windows of this appli by middle-clicking " "on the icon pointing on the sub-dock." msgstr "" -#: ../data/messages:823 +#: ../data/messages:825 msgid "" -"croll on the icon of one of the windows of this appli, or even on the icon " +"Scroll on the icon of one of the windows of this appli, or even on the icon " "pointing on the sub-dock if you group windows in a sub-dock." msgstr "" -#: ../data/messages:825 +#: ../data/messages:827 msgid "Replacing the gnome-panel" msgstr "" -#: ../data/messages:827 +#: ../data/messages:829 msgid "How can I have the main menu ?" msgstr "" -#: ../data/messages:829 +#: ../data/messages:831 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F1” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the menu at the " "mouse’s location." msgstr "" -#: ../data/messages:831 +#: ../data/messages:833 msgid "activate the Gmenu applet." msgstr "" -#: ../data/messages:833 +#: ../data/messages:835 msgid "How can I have a simple “quick launch” panel ?" msgstr "" -#: ../data/messages:835 +#: ../data/messages:837 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F2” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the quick-" "launch dialog." msgstr "" -#: ../data/messages:837 +#: ../data/messages:839 msgid "" "activate the Gmenu applet, then you can have it by middle-clicking on its " "icon." msgstr "" -#: ../data/messages:839 +#: ../data/messages:841 msgid "How can I have a logout icon ?" msgstr "" -#: ../data/messages:841 +#: ../data/messages:843 msgid "" "Hint : In the last Gnome version, there are 2 panel : one to logout, and one " "to turn off computer. The first one is raised by a click on the icon, the " @@ -2445,77 +2481,77 @@ "let you enter your own commands." msgstr "" -#: ../data/messages:843 +#: ../data/messages:845 msgid "Simply activate the “logout” applet." msgstr "" -#: ../data/messages:845 +#: ../data/messages:847 msgid "How can I access the dustbin ?" msgstr "" -#: ../data/messages:847 +#: ../data/messages:849 msgid "" "Hint : you can delete a file by dragging it into the dustbin. You can even " "unmount a mount-point this way !" msgstr "" -#: ../data/messages:849 +#: ../data/messages:851 msgid "Simply activate the “dustbin” applet." msgstr "" -#: ../data/messages:851 +#: ../data/messages:853 msgid "How can I access to my mount points ?" msgstr "" -#: ../data/messages:853 +#: ../data/messages:855 msgid "" "Hint : you can mount a volume by clicking on its icon. To unmount it, right-" "click and select “unmount”." msgstr "" -#: ../data/messages:855 ../data/messages:861 +#: ../data/messages:857 ../data/messages:863 msgid "Simply activate the “shortcuts” applet." msgstr "" -#: ../data/messages:857 +#: ../data/messages:859 msgid "How can I access to my Nautilus bookmarks ?" msgstr "" -#: ../data/messages:859 +#: ../data/messages:861 msgid "" "Hint : you can add a bookmark by dragging the folder onto the applet or into " "its sub-dock. You can also rename and remove them. This will also take " "effect in Nautilus immediately, and vice versa." msgstr "" -#: ../data/messages:863 +#: ../data/messages:865 msgid "How can I access to my desktop ?" msgstr "" -#: ../data/messages:865 +#: ../data/messages:867 msgid "" "Hint : middle-clicking on it will hide all the windows, but not the desklets." msgstr "" -#: ../data/messages:867 +#: ../data/messages:869 msgid "Simply activate the “show desktop” applet." msgstr "" -#: ../data/messages:869 +#: ../data/messages:871 msgid "How can I have an easy-to-acces calendar ?" msgstr "" -#: ../data/messages:871 +#: ../data/messages:873 msgid "" "activate the “clock” applet; clicking on it will display a calendar, " "clicking again will hide it." msgstr "" -#: ../data/messages:873 +#: ../data/messages:875 msgid "How can I have the notification area (also called systray) ?" msgstr "" -#: ../data/messages:875 +#: ../data/messages:877 msgid "" "activate the “systray” applet. For the moment it can’t be displayed directly " "into the dock,\n" @@ -2525,51 +2561,51 @@ "of your screen, and keep it above other windows." msgstr "" -#: ../data/messages:877 +#: ../data/messages:879 msgid "" "How can I have an easy-to-access terminal with real transparence, like " "Tilda ?" msgstr "" -#: ../data/messages:879 +#: ../data/messages:881 msgid "" "Hint : clicking next to the last tab will create a new tab. Double-clicking " "on a tab allows you to rename it. You can even change the color of a tab !" msgstr "" -#: ../data/messages:881 +#: ../data/messages:883 msgid "" "activate the “terminal” applet. You can detach it and place it on the Widget " "Layer for instance, or setup a shorkey to make it pop-up instantly." msgstr "" -#: ../data/messages:883 +#: ../data/messages:885 msgid "So then, how can I remove completely the gnome-panel ?" msgstr "" -#: ../data/messages:885 +#: ../data/messages:887 msgid "" "Open gconf-editor, edit the key /desktop/gnome/session/" "required_components_list, and erase its content (\"panel\").\n" "Restart your session : the gnome-panel has not been started." msgstr "" -#: ../data/messages:887 +#: ../data/messages:889 msgid "Other applets" msgstr "" -#: ../data/messages:889 +#: ../data/messages:891 msgid "How can I have a same applet many times ?" msgstr "" -#: ../data/messages:891 +#: ../data/messages:893 msgid "" "Hint : This allows you, for example, to have the time of different countries " "in your dock, or to have many animated caracters in your dock, or the " "weather of different cities." msgstr "" -#: ../data/messages:893 +#: ../data/messages:895 msgid "" "Some applets can run several times at the same time : Clock, Cairo-Penguin, " "Weather, Netspeed, …\n" @@ -2578,64 +2614,70 @@ "You can configure this new one like any other applet." msgstr "" -#: ../data/messages:895 +#: ../data/messages:897 msgid "" "I have a personal gauge that I want to use in the dock (for cpusage or " "others)" msgstr "" -#: ../data/messages:897 +#: ../data/messages:899 msgid "" "move the folder containing your gauge in ~/.config/cairo-dock/extras/gauges, " "you’re done !" msgstr "" -#: ../data/messages:899 +#: ../data/messages:901 msgid "" "I have a personal Cairo-Clock theme that I want to use in the “clock” applet." msgstr "" -#: ../data/messages:901 +#: ../data/messages:903 msgid "" "Hint : the same goes on for all the applets that propose a theme : dustbin, " "Cairo-Penguin, weather, etc." msgstr "" -#: ../data/messages:903 +#: ../data/messages:905 msgid "" "move the folder containing your theme in ~/.config/cairo-dock/extras/clock, " "you’re done !" msgstr "" -#: ../data/messages:905 +#: ../data/messages:907 msgid "How can I change quickly the luminosity of my screen ?" msgstr "" -#: ../data/messages:907 +#: ../data/messages:909 msgid "" "Activate the Xgamma applet, then you can scroll up/down on the icon with the " "mouse." msgstr "" -#: ../data/messages:909 +#: ../data/messages:911 msgid "How can I change quickly the speakers volume ?" msgstr "" -#: ../data/messages:911 +#: ../data/messages:913 msgid "" "Activate the AlsaMixer applet, then you can scroll up/down on the icon with " "the mouse." msgstr "" -#: ../data/messages:913 +#: ../data/messages:915 msgid "Troubleshooting" msgstr "" -#: ../data/messages:915 +#: ../data/messages:917 msgid "I have a black background around my dock" msgstr "" -#: ../data/messages:917 +#: ../data/messages:919 +msgid "" +"Hint : If yo have an ATI or an Intel, you should try without OpenGL first, " +"because their drivers are not yet perfect." +msgstr "" + +#: ../data/messages:921 msgid "" "You have to turn on the compositing. For instance, you can run Compiz or " "xcompmgr. \n" @@ -2643,26 +2685,22 @@ "window manager’s options." msgstr "" -#: ../data/messages:919 +#: ../data/messages:923 msgid "My machine is too old to run a composite manager" msgstr "" -#: ../data/messages:921 +#: ../data/messages:925 msgid "" "Don’t panic, Cairo-Dock can emulate the transparency.\n" "So to get rid of the black background, just activate the corresponding " "option, in the end of the “System” module" msgstr "" -#: ../data/messages:923 +#: ../data/messages:927 msgid "The dock is horribly slow when I move the mouse into it" msgstr "" -#: ../data/messages:925 -msgid "Hint : " -msgstr "" - -#: ../data/messages:927 +#: ../data/messages:929 msgid "" "If you have a GeForce8, you have to install the latest drivers, because the " "first ones were really buggy.\n" @@ -2672,34 +2710,34 @@ "dock with “cairo-dock –c”." msgstr "" -#: ../data/messages:929 +#: ../data/messages:931 msgid "I don’t have these wonderful effects like fire, cube rotating, etc" msgstr "" -#: ../data/messages:931 +#: ../data/messages:933 msgid "" "Hint : You can force the openGL by launching the dock with “cairo-dock –o”." "but you might get a lot of visual artifacts." msgstr "" -#: ../data/messages:933 +#: ../data/messages:935 msgid "" "You need a graphic card with drivers that support openGL2.0. Most of Nvidia " "cards can do that, more and more Intel cards can do too. Most of ATI cards " "can’t do that." msgstr "" -#: ../data/messages:935 +#: ../data/messages:937 msgid "The “netspeed” applet displays 0 even when I’m downloading something" msgstr "" -#: ../data/messages:937 +#: ../data/messages:939 msgid "" "Hint : you can instantiate this applet many times if you want to monitor " "many interfaces." msgstr "" -#: ../data/messages:939 +#: ../data/messages:941 msgid "" "You have to tell it which interface you’re using to connect to the Net (by " "default, it’s “eth0”).\n" @@ -2708,11 +2746,11 @@ "probably something like “eth1”, “ath0”, or “wifi0”." msgstr "" -#: ../data/messages:941 +#: ../data/messages:943 msgid "The dustbin remains empty even when I delete a file" msgstr "" -#: ../data/messages:943 +#: ../data/messages:945 msgid "" "if you’re under KDE, you may have to tell it the path of the trash folder.\n" "Just edit the applet’s configuration, and fill in the Trash path; it is " @@ -2720,11 +2758,11 @@ "here !!! (do not insert spaces or some invisible caracters)." msgstr "" -#: ../data/messages:945 +#: ../data/messages:947 msgid "Help us !" msgstr "" -#: ../data/messages:947 +#: ../data/messages:949 msgid "" "We value your help ! If you see a bug, or if you think something could be " "improved,\n" @@ -2737,28 +2775,28 @@ "Fabounet" msgstr "" -#: ../data/messages:951 +#: ../data/messages:953 msgid "Launcher's name :" msgstr "" -#: ../data/messages:953 +#: ../data/messages:955 msgid "" "Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard " "shortcut, for exemple F1 for the Applications Menu, c or v " "to copy or paste, etc" msgstr "" -#: ../data/messages:955 +#: ../data/messages:957 msgid "Command to launch on click :" msgstr "" -#: ../data/messages:959 +#: ../data/messages:961 msgid "" "If you write here a container's name that doesn't exist yet, a new one will " "be created, with this icon inside." msgstr "" -#: ../data/messages:967 +#: ../data/messages:969 msgid "" "If you choosed to mix launcher and applis, this option will deactivate this " "behaviour for this launcher only. It can be useful for instance for a " @@ -2766,11 +2804,11 @@ "steal the Terminal's icon from the Taskbar." msgstr "" -#: ../data/messages:969 +#: ../data/messages:971 msgid "Prevent this launcher from stealing appli from taskbar ?" msgstr "" -#: ../data/messages:971 +#: ../data/messages:973 msgid "" "The only reason you may want to modify this parameter is if you made this " "launcher by hands. If you dropped it into the dock from the menu, it is " @@ -2778,119 +2816,123 @@ "program, which is useful to link the appli with its launcher." msgstr "" -#: ../data/messages:973 +#: ../data/messages:975 msgid "Class of the program :" msgstr "" -#: ../data/messages:975 +#: ../data/messages:977 +msgid "It will use 'xterm'." +msgstr "" + +#: ../data/messages:979 msgid "Run in a terminal ?" msgstr "" -#: ../data/messages:983 +#: ../data/messages:987 msgid "" "Choose the screen border regarding to which the dock will place itself :" msgstr "" -#: ../data/messages:1007 +#: ../data/messages:1011 msgid "" "The dock will automatically hide itself outside of the scren when the mouse " "leaves it and will show a callback zone instead. Place the mouse into this " "zone will make the dock re-appear." msgstr "" -#: ../data/messages:1021 +#: ../data/messages:1025 msgid "Themes" msgstr "" -#: ../data/messages:1023 +#: ../data/messages:1027 msgid "Choose a theme" msgstr "" -#: ../data/messages:1025 +#: ../data/messages:1029 msgid "Choose one of the available themes :" msgstr "" -#: ../data/messages:1027 +#: ../data/messages:1031 msgid "You can even drop an internet URL." msgstr "" -#: ../data/messages:1029 +#: ../data/messages:1033 msgid "... or drag and drop a theme package here :" msgstr "" -#: ../data/messages:1031 +#: ../data/messages:1035 msgid "" "So if you check this box, your launchers will be deleted and replaced by the " "ones provided in the new theme. Otherwise the current launchers will be " "kept, only icons will be replaced." msgstr "" -#: ../data/messages:1033 +#: ../data/messages:1037 msgid "Use the new theme's launchers ?" msgstr "" -#: ../data/messages:1035 +#: ../data/messages:1039 msgid "" "Otherwise the current behaviour will be kept. It's all about the dock's " "position, behaviour parameters such as auto-hide, using taskbar or not, etc." msgstr "" -#: ../data/messages:1037 +#: ../data/messages:1041 msgid "Use the new theme's behaviour ?" msgstr "" -#: ../data/messages:1039 +#: ../data/messages:1043 msgid "Save" msgstr "" -#: ../data/messages:1041 +#: ../data/messages:1045 msgid "Save current theme" msgstr "" -#: ../data/messages:1043 +#: ../data/messages:1047 msgid "You will then be able to re-open it at any time." msgstr "" -#: ../data/messages:1045 +#: ../data/messages:1049 msgid "Save as :" msgstr "" -#: ../data/messages:1047 +#: ../data/messages:1051 msgid "Save current behaviour too ?" msgstr "" -#: ../data/messages:1049 +#: ../data/messages:1053 msgid "Save current launchers too ?" msgstr "" -#: ../data/messages:1051 +#: ../data/messages:1055 msgid "" "The dock will build a complete tarball of your current theme, allowing you " "to exchange it easily with other people." msgstr "" -#: ../data/messages:1053 +#: ../data/messages:1057 msgid "Build a package of the theme ?" msgstr "" -#: ../data/messages:1055 +#: ../data/messages:1059 msgid "Delete" msgstr "" -#: ../data/messages:1057 +#: ../data/messages:1061 msgid "List of your personnal themes" msgstr "" -#: ../data/messages:1059 +#: ../data/messages:1063 msgid "Delete from the list themes you don't want anymore :" msgstr "" -#: ../data/messages:1061 +#: ../data/messages:1065 msgid "pouet" msgstr "" -#: ../data/messages:1063 ../data/messages:1065 ../data/messages:1067 -#: ../data/messages:1069 +#: ../data/messages:1067 ../data/messages:1069 ../data/messages:1071 +#: ../data/messages:1073 msgid "" "v1.4.6.3 :\n" "Just to say :\n" @@ -2898,7 +2940,7 @@ " the Cairo-Dock's team." msgstr "" -#: ../data/messages:1071 +#: ../data/messages:1075 msgid "" "v1.5.0 : it's been 1 month since previous release, and we worked hardly to " "bring you :\n" @@ -2918,7 +2960,7 @@ " Now, why not try to make an applet for Cairo-Dock ? ;-)" msgstr "" -#: ../data/messages:1073 +#: ../data/messages:1077 msgid "" "v1.5.1 :\n" " - The 1.5 branch is still young, so this version brings a lot of bug fixes\n" @@ -2930,7 +2972,7 @@ " and behave as real desklets." msgstr "" -#: ../data/messages:1075 +#: ../data/messages:1079 msgid "" "v1.5.2.1 :\n" " - a lot of bug fixes, especially on desklets.\n" @@ -2938,7 +2980,7 @@ " - Cairo-Dock is now fully translated in Japanese, thanks to Jiro Kawada !" msgstr "" -#: ../data/messages:1077 +#: ../data/messages:1081 msgid "" "v1.5.3.2 :\n" " - Themes have been deeply reviewed\n" @@ -2952,7 +2994,7 @@ " who could help cairo-dock to be well-integrated into KDE ;-)" msgstr "" -#: ../data/messages:1079 +#: ../data/messages:1083 msgid "" "v1.5.4.2 : a huge release !\n" " - add a cute pinguin in your dock with the new applet Cairo-Penguin\n" @@ -2966,7 +3008,7 @@ " - 3 more themes in Weather" msgstr "" -#: ../data/messages:1081 +#: ../data/messages:1085 msgid "" "v1.5.5.4 :\n" " - Huge enhancements in the TaskBar :\n" @@ -2982,7 +3024,7 @@ "soon ;-)" msgstr "" -#: ../data/messages:1083 +#: ../data/messages:1087 msgid "" "v1.5.6 :\n" " - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still " @@ -3000,7 +3042,7 @@ " - Any help would be welcome to integrate the dock into KDE !" msgstr "" -#: ../data/messages:1085 +#: ../data/messages:1089 msgid "" "v1.6.0 :\n" " - A new view has appeared : Diapositive !\n" @@ -3019,7 +3061,7 @@ " - Real window thumbnail when minimized." msgstr "" -#: ../data/messages:1087 +#: ../data/messages:1091 msgid "" "v1.6.1 :\n" "Cairo-Dock has one year ! To celebrate this event, we are happy to offer " @@ -3032,7 +3074,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1089 +#: ../data/messages:1093 msgid "" "v1.6.2 : the first version integrated in the Ubuntu repositories !\n" " - 2 new applets have been released :\n" @@ -3045,7 +3087,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1091 +#: ../data/messages:1095 msgid "" "v1.6.3 : \n" " - first the bad news :\n" @@ -3063,7 +3105,7 @@ " - The dock is now translated in Sweden and partially in Greek." msgstr "" -#: ../data/messages:1093 +#: ../data/messages:1097 msgid "" "Cairo-Dock II\n" " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " @@ -3076,16 +3118,10 @@ " - Lot of bug fixes and upgrades in all plug-ins." msgstr "" -#: ../data/messages:1095 +#: ../data/messages:1099 msgid "" -"Cairo-Dock II\n" -" - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " -"available for old graphic cards or ATI)\n" -" - New plug-ins provide many visual affects : Animated icons, icon effects, " -"illusion, drop indicator, motion blur, dialog rendering\n" -" - The config panel has been widely rewritten.\n" -" - Desklets are now in 3D\n" -" - New applets : mail, keyboard indicator, quick folder, Toons.\n" -" - Lot of bug fixes and upgrades in all plug-ins.\n" -" - 2.0.3 : some bug fixes + improvment of the config panel." +"2.0.5 :\n" +" - This is mainly a bug-fix version\n" +" - improvment in the RB applet\n" +" - Added functionnalities on grouped applications icons." msgstr "" diff -Nru cairo-dock-2.0.3/po/fr.po cairo-dock-2.0.5/po/fr.po --- cairo-dock-2.0.3/po/fr.po 2009-05-23 02:54:58.000000000 +0200 +++ cairo-dock-2.0.5/po/fr.po 2009-06-10 02:31:41.000000000 +0200 @@ -16,14 +16,10 @@ "X-Poedit-Language: French\n" "X-Poedit-Country: France\n" -#: ../src/cairo-dock-callbacks.c:1184 +#: ../src/cairo-dock-callbacks.c:1181 msgid "Do you want to mount this point ?" msgstr "Voulez-vous monter ce point ?" -#: ../src/cairo-dock-callbacks.c:1773 -msgid "Quit Cairo-Dock ?" -msgstr "Quitter Cairo-Dock ?" - #: ../src/cairo-dock-desktop-file-factory.c:158 msgid "Do you want to monitor the content of the directory ?" msgstr "Voulez-vous surveiller le contenu de ce répertoire ?" @@ -85,7 +81,7 @@ "Soyez sûr de l'installer dans la même version que le dock pour pouvoir en " "bénéficier." -#: ../src/cairo-dock-gui-factory.c:715 +#: ../src/cairo-dock-gui-factory.c:722 #, c-format msgid "" "The '%s' plug-in is not active.\n" @@ -94,75 +90,75 @@ "Le plug-in '%s' n'est pas actif.\n" "Soyez sûr de l'activer pour pouvoir en bénéficier." -#: ../src/cairo-dock-gui-factory.c:1710 +#: ../src/cairo-dock-gui-factory.c:1719 msgid "grab" msgstr "récupérer" -#: ../src/cairo-dock-gui-manager.c:72 ../data/messages:89 +#: ../src/cairo-dock-gui-manager.c:73 ../data/messages:89 msgid "Behaviour" msgstr "Comportement" -#: ../src/cairo-dock-gui-manager.c:73 +#: ../src/cairo-dock-gui-manager.c:74 msgid "Appearance" msgstr "Apparence" -#: ../src/cairo-dock-gui-manager.c:74 +#: ../src/cairo-dock-gui-manager.c:75 msgid "Accessories" msgstr "Accessoires" -#: ../src/cairo-dock-gui-manager.c:75 +#: ../src/cairo-dock-gui-manager.c:76 msgid "Desktop" msgstr "Bureau" -#: ../src/cairo-dock-gui-manager.c:76 +#: ../src/cairo-dock-gui-manager.c:77 msgid "Controlers" msgstr "Contrôleurs" -#: ../src/cairo-dock-gui-manager.c:77 +#: ../src/cairo-dock-gui-manager.c:78 msgid "Plug-ins" msgstr "Plug-ins" -#: ../src/cairo-dock-gui-manager.c:406 +#: ../src/cairo-dock-gui-manager.c:407 msgid "Categories" msgstr "Catégories" -#: ../src/cairo-dock-gui-manager.c:427 +#: ../src/cairo-dock-gui-manager.c:428 msgid "All" msgstr "Tout" -#: ../src/cairo-dock-gui-manager.c:533 +#: ../src/cairo-dock-gui-manager.c:534 msgid "Activate this module" msgstr "Activer ce module" -#: ../src/cairo-dock-gui-manager.c:551 +#: ../src/cairo-dock-gui-manager.c:552 msgid "Filter" msgstr "Filtre" -#: ../src/cairo-dock-gui-manager.c:591 +#: ../src/cairo-dock-gui-manager.c:592 msgid "All words" msgstr "Tous les mots" -#: ../src/cairo-dock-gui-manager.c:598 +#: ../src/cairo-dock-gui-manager.c:599 msgid "Highlight words" msgstr "Surligner les mots" -#: ../src/cairo-dock-gui-manager.c:606 +#: ../src/cairo-dock-gui-manager.c:607 msgid "Hide others" msgstr "Cacher les autres" -#: ../src/cairo-dock-gui-manager.c:614 +#: ../src/cairo-dock-gui-manager.c:615 msgid "Search in description" msgstr "Chercher dans la description" -#: ../src/cairo-dock-gui-manager.c:677 +#: ../src/cairo-dock-gui-manager.c:686 msgid "< Maintenance mode >" msgstr "< Mode Maintenance >" -#: ../src/cairo-dock-gui-manager.c:695 ../src/cairo-dock-gui-manager.c:766 +#: ../src/cairo-dock-gui-manager.c:704 ../src/cairo-dock-gui-manager.c:775 msgid "Configuration of Cairo-Dock" msgstr "Configuration de Cairo-Dock" -#: ../src/cairo-dock-gui-manager.c:1004 +#: ../src/cairo-dock-gui-manager.c:1013 #, c-format msgid "" "The module '%s' is not present. You need to install it or its dependencies " @@ -171,17 +167,17 @@ "Le module '%s' n'est pas présent. Vous devez l'installer, lui ou ses " "dépendances pour pouvoir en bénéficier." -#: ../src/cairo-dock-gui-manager.c:1010 +#: ../src/cairo-dock-gui-manager.c:1019 #, c-format msgid "The module '%s' is not activated." msgstr "Le module '%s' n'est pas actif." -#: ../src/cairo-dock-gui-manager.c:1011 +#: ../src/cairo-dock-gui-manager.c:1020 msgid "Do you want to activate it now ?" msgstr "Voulez-vous l'activer maintenant ?" #: ../src/cairo-dock-internal-accessibility.c:170 -#: ../src/cairo-dock-menu.c:1409 ../data/messages:39 +#: ../src/cairo-dock-menu.c:1562 ../data/messages:39 msgid "Accessibility" msgstr "Accessibilité" @@ -229,16 +225,16 @@ msgid "Define the appearance of the dock when it's hidden." msgstr "Définissez l'apparence du dock lorsqu'il est caché." -#: ../src/cairo-dock-internal-icons.c:337 +#: ../src/cairo-dock-internal-icons.c:348 msgid "It provides many animations to your icons." msgstr "Il fournit plusieurs animations à vos icônes." -#: ../src/cairo-dock-internal-icons.c:339 ../data/messages:355 +#: ../src/cairo-dock-internal-icons.c:350 ../data/messages:355 #: ../data/messages:665 msgid "Icons" msgstr "Icônes" -#: ../src/cairo-dock-internal-icons.c:341 +#: ../src/cairo-dock-internal-icons.c:352 msgid "" "All about icons :\n" " size, reflection, icon theme, ..." @@ -266,12 +262,12 @@ # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-internal-position.c:95 ../data/messages:1 -#: ../data/messages:977 +#: ../src/cairo-dock-internal-position.c:96 ../data/messages:1 +#: ../data/messages:981 msgid "Position" msgstr "Positionnement" -#: ../src/cairo-dock-internal-position.c:97 +#: ../src/cairo-dock-internal-position.c:98 msgid "Set the position of the main dock." msgstr "Réglez la position du dock principal." @@ -307,19 +303,23 @@ msgid "Select a view for each of your docks." msgstr "Sélectionnez une vue pour chacun de vos docks." -#: ../src/cairo-dock-menu.c:142 +#: ../src/cairo-dock-menu.c:139 msgid "Development" msgstr "Développement" -#: ../src/cairo-dock-menu.c:148 +#: ../src/cairo-dock-menu.c:145 msgid "Artwork" msgstr "Artistes" -#: ../src/cairo-dock-menu.c:152 +#: ../src/cairo-dock-menu.c:149 msgid "Support" msgstr "Support" -#: ../src/cairo-dock-menu.c:237 +#: ../src/cairo-dock-menu.c:231 +msgid "Quit Cairo-Dock ?" +msgstr "Quitter Cairo-Dock ?" + +#: ../src/cairo-dock-menu.c:246 msgid "" "Do you want to re-dispatch the icons contained inside this container into " "the dock ?\n" @@ -329,24 +329,24 @@ "dock ?\n" " (autrement elles seront détruites)" -#: ../src/cairo-dock-menu.c:258 +#: ../src/cairo-dock-menu.c:267 #, c-format msgid "You're about removing this icon (%s) from the dock. Sure ?" msgstr "Vous êtes sur le point d'enlever cette icône (%s) du dock. Sûr ?" -#: ../src/cairo-dock-menu.c:314 +#: ../src/cairo-dock-menu.c:323 msgid "Fill this launcher" msgstr "Remplissez ce lanceur" -#: ../src/cairo-dock-menu.c:326 +#: ../src/cairo-dock-menu.c:335 msgid "Undefined" msgstr "Indéfini" -#: ../src/cairo-dock-menu.c:478 ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:487 ../src/cairo-dock-menu.c:1448 msgid "Modify this launcher" msgstr "Modifier ce lanceur" -#: ../src/cairo-dock-menu.c:620 +#: ../src/cairo-dock-menu.c:629 #, c-format msgid "" "You're about deleting this file\n" @@ -357,7 +357,7 @@ " (%s)\n" "de votre disque dur. Sur ?" -#: ../src/cairo-dock-menu.c:629 +#: ../src/cairo-dock-menu.c:638 msgid "" "Attention : couldn't delete this file.\n" "Check that you have writing rights on it." @@ -365,11 +365,11 @@ "Attention : échec de suppression du fichier\n" " Vérifiez les droits en écriture." -#: ../src/cairo-dock-menu.c:653 +#: ../src/cairo-dock-menu.c:662 msgid "Rename to :" msgstr "Renommer en :" -#: ../src/cairo-dock-menu.c:660 +#: ../src/cairo-dock-menu.c:669 #, c-format msgid "" "Attention : couldn't rename %s.\n" @@ -380,246 +380,282 @@ "Vérifiez que vous avez les drots en écriture,\n" " et que le nouveau nom n'existe pas déjà." -#: ../src/cairo-dock-menu.c:705 +#: ../src/cairo-dock-menu.c:714 #, c-format msgid "You're about removing this applet (%s) from the dock. Sure ?" msgstr "Vous êtes sur le point d'enlever cette applet (%s) du dock. Sûr ?" -#: ../src/cairo-dock-menu.c:1034 +#: ../src/cairo-dock-menu.c:840 +msgid "" +"Sorry, couldn't find the corresponding description file.\n" +"Consider drag and dropping the launcher from the Applications Menu." +msgstr "" + +#: ../src/cairo-dock-menu.c:1166 #, c-format msgid "Set position for the dock '%s'" msgstr "Régler la position pour le dock '%s'" -#: ../src/cairo-dock-menu.c:1117 +#: ../src/cairo-dock-menu.c:1249 msgid "Configure" msgstr "Configurer" -#: ../src/cairo-dock-menu.c:1124 +#: ../src/cairo-dock-menu.c:1256 msgid "Set up this dock" msgstr "Régler ce dock" -#: ../src/cairo-dock-menu.c:1126 +#: ../src/cairo-dock-menu.c:1258 msgid "Manage themes" msgstr "Gestion des thèmes" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "unlock icons" msgstr "déverrouiller les icônes" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "lock icons" msgstr "verrouiller les icônes" -#: ../src/cairo-dock-menu.c:1139 +#: ../src/cairo-dock-menu.c:1271 msgid "Quick-Hide" msgstr "Cachage rapide" -#: ../src/cairo-dock-menu.c:1147 +#: ../src/cairo-dock-menu.c:1279 msgid "Launch Cairo-Dock on startup" msgstr "Lancer Cairo-Dock au démarrage" -#: ../src/cairo-dock-menu.c:1153 +#: ../src/cairo-dock-menu.c:1285 msgid "Development's site" msgstr "Site de développement" -#: ../src/cairo-dock-menu.c:1155 +#: ../src/cairo-dock-menu.c:1287 msgid "Community's site" msgstr "Site de la communauté" -#: ../src/cairo-dock-menu.c:1157 +#: ../src/cairo-dock-menu.c:1289 msgid "Help" msgstr "Aide" -#: ../src/cairo-dock-menu.c:1159 +#: ../src/cairo-dock-menu.c:1291 msgid "About" msgstr "A propos" -#: ../src/cairo-dock-menu.c:1163 +#: ../src/cairo-dock-menu.c:1295 msgid "Quit" msgstr "Quitter" -#: ../src/cairo-dock-menu.c:1191 ../src/cairo-dock-menu.c:1253 +#: ../src/cairo-dock-menu.c:1315 +#, fuzzy, c-format +msgid "Move all to desktop %d - face %d" +msgstr "Aller au bureau %d - face %d" + +#: ../src/cairo-dock-menu.c:1315 +#, c-format +msgid "Move to desktop %d - face %d" +msgstr "Aller au bureau %d - face %d" + +#: ../src/cairo-dock-menu.c:1317 +#, fuzzy, c-format +msgid "Move all to desktop %d" +msgstr "Aller au bureau %d" + +#: ../src/cairo-dock-menu.c:1317 +#, c-format +msgid "Move to desktop %d" +msgstr "Aller au bureau %d" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Move all to face %d" +msgstr "Aller sur la face %d" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Moveto face %d" +msgstr "Aller sur la face %d" + +#: ../src/cairo-dock-menu.c:1368 ../src/cairo-dock-menu.c:1430 msgid "Add a manual launcher" msgstr "Ajouter un lanceur manuel" -#: ../src/cairo-dock-menu.c:1192 ../src/cairo-dock-menu.c:1254 +#: ../src/cairo-dock-menu.c:1369 ../src/cairo-dock-menu.c:1431 msgid "" "Don't forget you can drag a launcher from the menu and drop it in the dock !" msgstr "" "N'oubliez pas que vous pouvez glisser un lanceur à partir du menu et le " "déposer dans le dock !" -#: ../src/cairo-dock-menu.c:1194 ../src/cairo-dock-menu.c:1256 +#: ../src/cairo-dock-menu.c:1371 ../src/cairo-dock-menu.c:1433 msgid "Add a sub-dock" msgstr "Ajouter un sous-dock" -#: ../src/cairo-dock-menu.c:1198 ../src/cairo-dock-menu.c:1260 +#: ../src/cairo-dock-menu.c:1375 ../src/cairo-dock-menu.c:1437 msgid "Add a separator" msgstr "Ajouter un séparateur" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Unmount" msgstr "Démonter" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Mount" msgstr "Monter" -#: ../src/cairo-dock-menu.c:1224 +#: ../src/cairo-dock-menu.c:1401 msgid "Eject" msgstr "Ejecter" -#: ../src/cairo-dock-menu.c:1231 +#: ../src/cairo-dock-menu.c:1408 msgid "Delete this file" msgstr "Effacer ce fichier" -#: ../src/cairo-dock-menu.c:1235 +#: ../src/cairo-dock-menu.c:1412 msgid "Rename this file" msgstr "Renommer ce fichier" -#: ../src/cairo-dock-menu.c:1239 +#: ../src/cairo-dock-menu.c:1416 msgid "Properties" msgstr "Propriétés" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this separator" msgstr "Enlever ce séparateur" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this launcher" msgstr "Supprimer ce lanceur" -#: ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:1448 msgid "Modify this separator" msgstr "Modifier ce séparateur" -#: ../src/cairo-dock-menu.c:1281 +#: ../src/cairo-dock-menu.c:1459 ../src/cairo-dock-menu.c:1503 msgid "Other actions" msgstr "Autres actions" -#: ../src/cairo-dock-menu.c:1286 +#: ../src/cairo-dock-menu.c:1464 msgid "Move to this desktop" msgstr "Déplacer sur ce bureau" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Not Fullscreen" msgstr "Quitter le plein écran" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Fullscreen" msgstr "Plein écran" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Don't keep above" msgstr "Ne plus garder au-dessus" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Keep above" msgstr "Garder au-dessus" -#: ../src/cairo-dock-menu.c:1300 -#, c-format -msgid "Move to desktop %d - face %d" -msgstr "Aller au bureau %d - face %d" - -#: ../src/cairo-dock-menu.c:1302 -#, c-format -msgid "Move to desktop %d" -msgstr "Aller au bureau %d" - -#: ../src/cairo-dock-menu.c:1304 -#, c-format -msgid "Move to face %d" -msgstr "Aller sur la face %d" - -#: ../src/cairo-dock-menu.c:1335 +#: ../src/cairo-dock-menu.c:1475 msgid "Kill" msgstr "Tuer" -#: ../src/cairo-dock-menu.c:1341 ../src/cairo-dock-menu.c:1365 +#: ../src/cairo-dock-menu.c:1480 ../src/cairo-dock-menu.c:1514 msgid "Launch new" msgstr "Lancer un nouveau" -#: ../src/cairo-dock-menu.c:1346 +#: ../src/cairo-dock-menu.c:1485 msgid "Make it a launcher" msgstr "Faites-en un lanceur" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Unmaximize" msgstr "Dé-maximiser" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Maximize" msgstr "Maximiser" -#: ../src/cairo-dock-menu.c:1352 +#: ../src/cairo-dock-menu.c:1491 msgid "Show" msgstr "Montrer" -#: ../src/cairo-dock-menu.c:1354 +#: ../src/cairo-dock-menu.c:1493 msgid "Minimize" msgstr "Minimiser" -#: ../src/cairo-dock-menu.c:1356 +#: ../src/cairo-dock-menu.c:1495 msgid "Close" msgstr "Fermer" -#: ../src/cairo-dock-menu.c:1368 +#: ../src/cairo-dock-menu.c:1508 +#, fuzzy +msgid "Move all to this desktop" +msgstr "Déplacer sur ce bureau" + +#: ../src/cairo-dock-menu.c:1517 +#, fuzzy +msgid "Show all" +msgstr "Montrer" + +#: ../src/cairo-dock-menu.c:1519 +#, fuzzy +msgid "Minimize all" +msgstr "Minimiser" + +#: ../src/cairo-dock-menu.c:1521 msgid "Close all" msgstr "Fermer tous" -#: ../src/cairo-dock-menu.c:1387 +#: ../src/cairo-dock-menu.c:1540 msgid "Configure this applet" msgstr "Configurer cette applet" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Detach this applet" msgstr "Détacher cette applet" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Return to dock" msgstr "Retourner au dock" -#: ../src/cairo-dock-menu.c:1394 +#: ../src/cairo-dock-menu.c:1547 msgid "Remove this applet" msgstr "Enlever cette applet" -#: ../src/cairo-dock-menu.c:1398 +#: ../src/cairo-dock-menu.c:1551 msgid "Launch another instance of this applet" msgstr "Lancer une nouvelle instance de cette applet" -#: ../src/cairo-dock-menu.c:1426 +#: ../src/cairo-dock-menu.c:1579 msgid "Normal" msgstr "Normal" -#: ../src/cairo-dock-menu.c:1433 +#: ../src/cairo-dock-menu.c:1586 msgid "Always on top" msgstr "Toujours devant" -#: ../src/cairo-dock-menu.c:1440 +#: ../src/cairo-dock-menu.c:1593 msgid "Always below" msgstr "Toujours derrière" -#: ../src/cairo-dock-menu.c:1456 +#: ../src/cairo-dock-menu.c:1606 msgid "set behaviour in Compiz to: (name=cairo-dock & type=utility)" msgstr "Réglez le comportement de Compiz à : (name=cairo-dock & type=utility)" -#: ../src/cairo-dock-menu.c:1458 +#: ../src/cairo-dock-menu.c:1608 msgid "Reserve space" msgstr "" -#: ../src/cairo-dock-menu.c:1465 +#: ../src/cairo-dock-menu.c:1615 msgid "On all desktops" msgstr "" # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-menu.c:1471 +#: ../src/cairo-dock-menu.c:1621 msgid "Lock position" msgstr "Verrouiller la position" -#: ../src/cairo-dock-modules.c:107 +#: ../src/cairo-dock-modules.c:108 msgid "" "A useful FAQ that contains also a lot of hints.\n" "Let the mouse over a sentence to make the hint dialog popups." @@ -627,21 +663,31 @@ "Une FAQ utile qui contient aussi de nombreuses astuces.\n" "Laissez le pointeur au-dessus d'une phrase pour faire apparaître une astuce." -#: ../src/cairo-dock-themes-manager.c:439 +#: ../src/cairo-dock-themes-manager.c:145 +#, c-format +msgid "Downloading file %s ..." +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:186 +#, c-format +msgid "couldn't get distant file %s" +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:468 #, c-format msgid "Are you sure you want to overwrite theme %s ?" msgstr "Etes-vous sûr de vouloir écraser le thème %s ?" -#: ../src/cairo-dock-themes-manager.c:537 +#: ../src/cairo-dock-themes-manager.c:566 #, c-format msgid "Are you sure you want to delete theme %s ?" msgstr "Etes-vous sûr de vouloir effacer le thème %s ?" -#: ../src/cairo-dock-themes-manager.c:539 +#: ../src/cairo-dock-themes-manager.c:568 msgid "Are you sure you want to delete these themes ?" msgstr "Etes-vous sûr de vouloir effacer ces thèmes ?" -#: ../src/cairo-dock-themes-manager.c:601 +#: ../src/cairo-dock-themes-manager.c:630 msgid "" "You made some modifications in the current theme.\n" "You will loose them if you don't save before choosing a new theme. Continue " @@ -650,7 +696,7 @@ "Vous avez fait des modifications dans le thème courant\n" "Vous les perdrez si vous ne le sauvez pas d'abord. Continuer malgré tout ?" -#: ../src/cairo-dock-themes-manager.c:637 +#: ../src/cairo-dock-themes-manager.c:666 #, c-format msgid "" "couldn't get distant file %s/%s, maybe the server is down.\n" @@ -660,42 +706,16 @@ "être pas.\n" "Merci de réessayer ultérieurement ou de nous contacter sur cairo-dock.org." -#: ../src/cairo-dock-themes-manager.c:807 -msgid "< Safe Mode >" -msgstr "< Mode sûreté >" - -#: ../src/cairo-dock-themes-manager.c:807 +#: ../src/cairo-dock-themes-manager.c:858 msgid "Manage Themes" msgstr "Gérer les thèmes" -#: ../src/cairo-dock-themes-manager.c:812 -msgid "" -"You are running Cairo-Dock in safe mode.\n" -"Why ? Probably because a plug-in has messed into your dock,\n" -" or maybe your theme has got corrupted.\n" -"So, no plug-in will be available, and you can now save your current theme if " -"you want\n" -" before you start using the dock.\n" -"Try with your current theme, if it works, it means a plug-in is wrong.\n" -"Otherwise, try with another theme.\n" -"Save a config that is working, and restart the dock in normal mode.\n" -"Then, activate plug-ins one by one to guess which one is wrong." -msgstr "" -"Vous exécutez Cairo-dock en mode sécurité.\n" -"Pourquoi ? Probablement à cause d'un plug-in qui pose problème avec votre " -"dock,\n" -" ou peut-être parce que votre thème a été corrompu.\n" -"Donc, aucun plug-in ne sera disponible, and vous pouvez voir votre thème " -"courant si vous voulez\n" -" avant de commencer à utiliser le dock.\n" -"Essayez avec votre thème personnel, si cela fonctionne, cela signifie qu'un " -"plug-in pose problème.\n" -"Sinon, utilisez un autre thème.\n" -"Sauvegardez votre configuration fonctionnelle, and redémarrez le dock en " -"mode normal.\n" -"Ensuite, activez les plug-ins un à un pour déterminer lequel pose problème." +#: ../src/cairo-dock-themes-manager.c:902 +#, c-format +msgid "couldn't retrieve distant theme %s" +msgstr "" -#: ../src/cairo-dock.c:616 +#: ../src/cairo-dock.c:608 msgid "" "Welcome in Cairo-Dock2 !\n" "A default and simple theme has been loaded.\n" @@ -717,11 +737,11 @@ "En espérant que vous apprécierez ce logiciel !\n" " (vous pouvez maintenant cliquer sur ce dialogue pour le fermer)" -#: ../data/messages:3 ../data/messages:979 +#: ../data/messages:3 ../data/messages:983 msgid "Position on the screen" msgstr "Positionnement sur l'écran" -#: ../data/messages:5 ../data/messages:981 +#: ../data/messages:5 ../data/messages:985 msgid "" "The icons will scroll according to the chosen placement type. Of course the " "dock can be placed anywhere on the screen, here we specify regarding to what." @@ -734,23 +754,23 @@ msgid "Choose which screen border the dock will placed on :" msgstr "Choisissez sur quel coin de l'écran le dock va se placer " -#: ../data/messages:9 ../data/messages:985 +#: ../data/messages:9 ../data/messages:989 msgid "bottom" msgstr "bas" -#: ../data/messages:11 ../data/messages:987 +#: ../data/messages:11 ../data/messages:991 msgid "top" msgstr "haut" -#: ../data/messages:13 ../data/messages:989 +#: ../data/messages:13 ../data/messages:993 msgid "right" msgstr "droit" -#: ../data/messages:15 ../data/messages:991 +#: ../data/messages:15 ../data/messages:995 msgid "left" msgstr "gauche" -#: ../data/messages:17 ../data/messages:993 +#: ../data/messages:17 ../data/messages:997 msgid "" "At 0, the dock will place itself regarding the left corner if horizontal and " "the top corner if vertical, at 1 regarding the right corner if horizontal " @@ -761,15 +781,15 @@ "haut à la verticale), à 1 relativement au coin droit à l'horizontal (coin " "bas à la verticale), et à 0.5 relativement au milieu du bord de l'écran." -#: ../data/messages:19 ../data/messages:995 +#: ../data/messages:19 ../data/messages:999 msgid "Relative alignment :" msgstr "Alignement relatif :" -#: ../data/messages:21 ../data/messages:997 +#: ../data/messages:21 ../data/messages:1001 msgid "Position regarding the chosen screen's edge" msgstr "Positionnement par rapport au bord de l'écran choisi" -#: ../data/messages:23 ../data/messages:999 +#: ../data/messages:23 ../data/messages:1003 msgid "" "Gap from the absolute position on the screen's edge, in pixels. You can also " "move the dock by holding ALT or CTRL key and left mouse button." @@ -777,11 +797,11 @@ "Ecart à partir de la position absolue sur le bord de l'écran, en pixels. " "Vous pouvez aussi déplacer le dock en pressant la touche " -#: ../data/messages:25 ../data/messages:1001 +#: ../data/messages:25 ../data/messages:1005 msgid "Lateral gap :" msgstr "Ecart latéral :" -#: ../data/messages:27 ../data/messages:1003 +#: ../data/messages:27 ../data/messages:1007 msgid "" "in pixels. You can also move the dock by holding ALT or CTRL key and left " "mouse button." @@ -789,7 +809,7 @@ "en pixels. Vous pouvez aussi déplacer le dock en maintenant les touches ALT " "ou CTRL enfoncées et en cliquant gauche sur le dock." -#: ../data/messages:29 ../data/messages:1005 +#: ../data/messages:29 ../data/messages:1009 msgid "Distance to the screen's edge :" msgstr "Distance au bord de l'écran :" @@ -853,7 +873,7 @@ "quittera, et montrera une zone de rappel à sa place. Placer la souris dans " "cette zone fera ré-apparaître le dock." -#: ../data/messages:55 ../data/messages:1009 +#: ../data/messages:55 ../data/messages:1013 msgid "Activate auto-hide ?" msgstr "Activer le masquage automatique" @@ -1079,12 +1099,13 @@ msgid "" "It will notify you even if, for instance, you're watching a video in " "fullscreen." -msgstr "Celà vous notifiera si vous regardez une vidéo par exemple." +msgstr "" +"Celà vous notifiera même si par exemple vous regardez une vidéo en plein " +"écran." #: ../data/messages:149 msgid "Force the following applications to demand your attention ?" -msgstr "" -"Signaler les fenêtres demandant votre attention par une bulle de dialogue ?" +msgstr "Forcer les applications suivantes à demander votre attention ?" #: ../data/messages:151 msgid "Signal the applications demanding your attention with an animation ?" @@ -2155,7 +2176,7 @@ msgid "Name of an image to use for the locked emblem :" msgstr "Nom d'une image pour l'emblem 'verrouillé' :" -#: ../data/messages:651 ../data/messages:949 ../data/messages:1011 +#: ../data/messages:651 ../data/messages:951 ../data/messages:1015 msgid "Desktop Entry" msgstr "Icône du menu" @@ -2163,19 +2184,19 @@ msgid "Sub-dock's name :" msgstr "Nom du sous-dock :" -#: ../data/messages:655 ../data/messages:957 ../data/messages:1013 +#: ../data/messages:655 ../data/messages:959 ../data/messages:1017 msgid "Image's name or path :" msgstr "Chemin ou nom de l'image :" -#: ../data/messages:657 ../data/messages:963 ../data/messages:1015 +#: ../data/messages:657 ../data/messages:965 ../data/messages:1019 msgid "Extra parameters" msgstr "Autres paramètres" -#: ../data/messages:659 ../data/messages:965 ../data/messages:1017 +#: ../data/messages:659 ../data/messages:967 ../data/messages:1021 msgid "Order you want for this launcher among the others:" msgstr "Ordre de ce lanceur parmi les autres :" -#: ../data/messages:661 ../data/messages:961 ../data/messages:1019 +#: ../data/messages:661 ../data/messages:963 ../data/messages:1023 msgid "Name of the container it belongs to:" msgstr "Nom du conteneur auquel il appartient :" @@ -2733,7 +2754,8 @@ #: ../data/messages:813 msgid "" -"Hint : to launch another instance of theprogram, shift+click on the launcher." +"Hint : to launch another instance of the program, shift+click on the " +"launcher." msgstr "" "Astuce : pour lancer une autre instance du programme, shift+clic sur le " "lanceur." @@ -2773,29 +2795,35 @@ #: ../data/messages:821 msgid "" +"How can I quickly navigate between many windows of the same application ?" +msgstr "" + +#: ../data/messages:823 +msgid "" "Hint : you can also close all the windows of this appli by middle-clicking " "on the icon pointing on the sub-dock." msgstr "" "Astuce : vous pouvez aussi fermer toutes les fenêtres de cette application " "avec un clic milieu sur l'icône pointant le sous-dock." -#: ../data/messages:823 +#: ../data/messages:825 +#, fuzzy msgid "" -"croll on the icon of one of the windows of this appli, or even on the icon " +"Scroll on the icon of one of the windows of this appli, or even on the icon " "pointing on the sub-dock if you group windows in a sub-dock." msgstr "" "Scrollez sur l'une des fenêtre de cette application, ou sur l'icône du sous-" "dock si vous groupez vos fenêtres dans un sous-dock." -#: ../data/messages:825 +#: ../data/messages:827 msgid "Replacing the gnome-panel" msgstr "Remplacer le gnome-panel" -#: ../data/messages:827 +#: ../data/messages:829 msgid "How can I have the main menu ?" msgstr "Comment puis-je avoir le menu Applications ?" -#: ../data/messages:829 +#: ../data/messages:831 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F1” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the menu at the " @@ -2805,15 +2833,15 @@ "ne fonctionnera plus. Cette applet vous permet de définir un raccourci pour " "afficher un menu à l'emplacement de la souris." -#: ../data/messages:831 +#: ../data/messages:833 msgid "activate the Gmenu applet." msgstr "Activez l'applet 'GMenu'." -#: ../data/messages:833 +#: ../data/messages:835 msgid "How can I have a simple “quick launch” panel ?" msgstr "Comment puis-je un simple panneau 'lancement rapide' ?" -#: ../data/messages:835 +#: ../data/messages:837 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F2” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the quick-" @@ -2823,7 +2851,7 @@ "ne fonctionnera plus. Cette applet vous permet de définir un raccourci pour " "afficher un dialogue de lancement." -#: ../data/messages:837 +#: ../data/messages:839 msgid "" "activate the Gmenu applet, then you can have it by middle-clicking on its " "icon." @@ -2831,13 +2859,13 @@ "Activez l'applet Gmenu, et vous pourrez l'obtenir avec un clic milieu sur " "l'icône. " -#: ../data/messages:839 +#: ../data/messages:841 msgid "How can I have a logout icon ?" msgstr "" "Comment puis-je avoir une icône de fermeture de session / changement " "d'utilisateur ?" -#: ../data/messages:841 +#: ../data/messages:843 msgid "" "Hint : In the last Gnome version, there are 2 panel : one to logout, and one " "to turn off computer. The first one is raised by a click on the icon, the " @@ -2850,15 +2878,15 @@ "permet d'inverser cette ordre, et vous laisse aussi rentrer vos propres " "commandes." -#: ../data/messages:843 +#: ../data/messages:845 msgid "Simply activate the “logout” applet." msgstr "Activez simplement l'applet 'logout'." -#: ../data/messages:845 +#: ../data/messages:847 msgid "How can I access the dustbin ?" msgstr "Comment puis-je accéder à la corbeille ?" -#: ../data/messages:847 +#: ../data/messages:849 msgid "" "Hint : you can delete a file by dragging it into the dustbin. You can even " "unmount a mount-point this way !" @@ -2866,15 +2894,15 @@ "Astuce : vous pouvez supprimer un fichier en le déposant sur la corbeille. " "Vous pouvez même monter un point de montage de cette manière ! " -#: ../data/messages:849 +#: ../data/messages:851 msgid "Simply activate the “dustbin” applet." msgstr "Activez simplement l'applet 'dustbin'." -#: ../data/messages:851 +#: ../data/messages:853 msgid "How can I access to my mount points ?" msgstr "Comment puis-je accéder à mes points de montage ?" -#: ../data/messages:853 +#: ../data/messages:855 msgid "" "Hint : you can mount a volume by clicking on its icon. To unmount it, right-" "click and select “unmount”." @@ -2882,15 +2910,15 @@ "Astuce : vous pouvez monter un volume en cliquant sur son icône. Pour le " "démonter, clic-droit dessus et sélectionnez 'démonter'." -#: ../data/messages:855 ../data/messages:861 +#: ../data/messages:857 ../data/messages:863 msgid "Simply activate the “shortcuts” applet." msgstr "Activez simplement l'applet 'shortcuts'." -#: ../data/messages:857 +#: ../data/messages:859 msgid "How can I access to my Nautilus bookmarks ?" msgstr "Comment puis-je accéder à mes signets Nautilus ?" -#: ../data/messages:859 +#: ../data/messages:861 msgid "" "Hint : you can add a bookmark by dragging the folder onto the applet or into " "its sub-dock. You can also rename and remove them. This will also take " @@ -2900,26 +2928,26 @@ "ou dans son sous-dock. Vous pouvez aussi le renommer et le déplacer. Cela " "prendra aussi effet dans Nautilus immédiatement, et inversement." -#: ../data/messages:863 +#: ../data/messages:865 msgid "How can I access to my desktop ?" msgstr "Comment puis-je accéder au bureau ?" -#: ../data/messages:865 +#: ../data/messages:867 msgid "" "Hint : middle-clicking on it will hide all the windows, but not the desklets." msgstr "" "Astuce : un clic-mileu sur l'icône cachera toutes les fenêtres, mais pas les " "desklets." -#: ../data/messages:867 +#: ../data/messages:869 msgid "Simply activate the “show desktop” applet." msgstr "Activez simplement l'applet 'show desktop'." -#: ../data/messages:869 +#: ../data/messages:871 msgid "How can I have an easy-to-acces calendar ?" msgstr "Comment puis-je avoir accès à un calendrier ?" -#: ../data/messages:871 +#: ../data/messages:873 msgid "" "activate the “clock” applet; clicking on it will display a calendar, " "clicking again will hide it." @@ -2927,12 +2955,12 @@ "Activez l'applet 'clock'; un clic dessus affichera un calendrier, un autre " "clic le cachera." -#: ../data/messages:873 +#: ../data/messages:875 msgid "How can I have the notification area (also called systray) ?" msgstr "" "Comment puis-je avoir une zone de notification (aussi appelée systray) ?" -#: ../data/messages:875 +#: ../data/messages:877 msgid "" "activate the “systray” applet. For the moment it can’t be displayed directly " "into the dock,\n" @@ -2948,7 +2976,7 @@ "Il est recommandé de détacher cette applet pour en faire un desklet, le " "placer sur un bord de l'écran, et de le garder au dessus des autres fenêtres." -#: ../data/messages:877 +#: ../data/messages:879 msgid "" "How can I have an easy-to-access terminal with real transparence, like " "Tilda ?" @@ -2956,7 +2984,7 @@ "Comment puis-je avoir un accès facile à un terminal avec la vraie " "transparence, comme Tilda ?" -#: ../data/messages:879 +#: ../data/messages:881 msgid "" "Hint : clicking next to the last tab will create a new tab. Double-clicking " "on a tab allows you to rename it. You can even change the color of a tab !" @@ -2965,7 +2993,7 @@ "cliquer sur un onglet permet de le renommer. Vous pouvez même changer la " "couleur de l'onglet !" -#: ../data/messages:881 +#: ../data/messages:883 msgid "" "activate the “terminal” applet. You can detach it and place it on the Widget " "Layer for instance, or setup a shorkey to make it pop-up instantly." @@ -2974,11 +3002,11 @@ "couche Widget de Compiz par exemple,\n" "ou enregistrer un raccourci clavier pour la faire apparaître instantanément." -#: ../data/messages:883 +#: ../data/messages:885 msgid "So then, how can I remove completely the gnome-panel ?" msgstr "Et donc, comment puis-je complètement désactiver le gnome-panel ?" -#: ../data/messages:885 +#: ../data/messages:887 msgid "" "Open gconf-editor, edit the key /desktop/gnome/session/" "required_components_list, and erase its content (\"panel\").\n" @@ -2988,15 +3016,15 @@ "required_components_list, et effacez son contenu (\"panel\").\n" "Redémarrez votre session : gnome-panel n'a pas été démarré" -#: ../data/messages:887 +#: ../data/messages:889 msgid "Other applets" msgstr "Autres applets" -#: ../data/messages:889 +#: ../data/messages:891 msgid "How can I have a same applet many times ?" msgstr "Comment puis-je avoir la même applet plusieurs fois ?" -#: ../data/messages:891 +#: ../data/messages:893 msgid "" "Hint : This allows you, for example, to have the time of different countries " "in your dock, or to have many animated caracters in your dock, or the " @@ -3006,7 +3034,7 @@ "dans votre dock, ou d'avoir plusieurs personnages animés dans votre dock, ou " "le temps de plusieurs villes." -#: ../data/messages:893 +#: ../data/messages:895 msgid "" "Some applets can run several times at the same time : Clock, Cairo-Penguin, " "Weather, Netspeed, …\n" @@ -3021,14 +3049,14 @@ "le dock principal.\n" "Vous pouvez le configurer ensuite comme n'importe quel autre applet." -#: ../data/messages:895 +#: ../data/messages:897 msgid "" "I have a personal gauge that I want to use in the dock (for cpusage or " "others)" msgstr "" "J'ai un thème de jauge que je voudrais utiliser (pour cpusage or autres)" -#: ../data/messages:897 +#: ../data/messages:899 msgid "" "move the folder containing your gauge in ~/.config/cairo-dock/extras/gauges, " "you’re done !" @@ -3036,14 +3064,14 @@ "Déplacez le répertoire contenant votre jauge dans ~/.config/cairo-dock/" "extras/gauges, et c'est bon !" -#: ../data/messages:899 +#: ../data/messages:901 msgid "" "I have a personal Cairo-Clock theme that I want to use in the “clock” applet." msgstr "" "J'ai un thème de Cairo-Clock que je voudrais utiliser pour l'applet " "'horloge'." -#: ../data/messages:901 +#: ../data/messages:903 msgid "" "Hint : the same goes on for all the applets that propose a theme : dustbin, " "Cairo-Penguin, weather, etc." @@ -3051,7 +3079,7 @@ "Astuce : la même chose vaut pour toutes les applets qui proposent un thème : " "dustbin, Cairo-Penguin, weather, etc." -#: ../data/messages:903 +#: ../data/messages:905 msgid "" "move the folder containing your theme in ~/.config/cairo-dock/extras/clock, " "you’re done !" @@ -3059,11 +3087,11 @@ "Déplacez le répertoire contenant votre thème dans ~/.config/cairo-dock/" "extras/clock, et c'est bon !" -#: ../data/messages:905 +#: ../data/messages:907 msgid "How can I change quickly the luminosity of my screen ?" msgstr "Comment puis-je changer rapidement la luminosité de mon écran ?" -#: ../data/messages:907 +#: ../data/messages:909 msgid "" "Activate the Xgamma applet, then you can scroll up/down on the icon with the " "mouse." @@ -3071,11 +3099,11 @@ "Activez l'applet 'Xgamma', vous pouvez alors scroller avec la molette de la " "souris sur l'icône." -#: ../data/messages:909 +#: ../data/messages:911 msgid "How can I change quickly the speakers volume ?" msgstr "Comment puis-je changer rapidement le volume du son ?" -#: ../data/messages:911 +#: ../data/messages:913 msgid "" "Activate the AlsaMixer applet, then you can scroll up/down on the icon with " "the mouse." @@ -3083,15 +3111,21 @@ "Activez l'applet 'AlsaMixer ', vous pouvez alors scroller avec la molette de " "la souris sur l'icône." -#: ../data/messages:913 +#: ../data/messages:915 msgid "Troubleshooting" msgstr "Problèmes" -#: ../data/messages:915 +#: ../data/messages:917 msgid "I have a black background around my dock" msgstr "J'ai un cadre noir autour de mon dock" -#: ../data/messages:917 +#: ../data/messages:919 +msgid "" +"Hint : If yo have an ATI or an Intel, you should try without OpenGL first, " +"because their drivers are not yet perfect." +msgstr "" + +#: ../data/messages:921 msgid "" "You have to turn on the compositing. For instance, you can run Compiz or " "xcompmgr. \n" @@ -3103,12 +3137,12 @@ "Si vous êtes sous XFCE, vous pouvez juste activer le composite dans les " "options du gestionnaire de fenêtres." -#: ../data/messages:919 +#: ../data/messages:923 msgid "My machine is too old to run a composite manager" msgstr "" "Ma machine est trop vieille pour faire tourner un gestionnaire de composite" -#: ../data/messages:921 +#: ../data/messages:925 msgid "" "Don’t panic, Cairo-Dock can emulate the transparency.\n" "So to get rid of the black background, just activate the corresponding " @@ -3118,15 +3152,11 @@ "Donc pour vous débarrasser du fond noir, activez l'option correspondante " "dans la config, à la fin du module 'Système'" -#: ../data/messages:923 +#: ../data/messages:927 msgid "The dock is horribly slow when I move the mouse into it" msgstr "Le dock est horriblement lent quand je bouge la souris dedans" -#: ../data/messages:925 -msgid "Hint : " -msgstr "Astuce :" - -#: ../data/messages:927 +#: ../data/messages:929 msgid "" "If you have a GeForce8, you have to install the latest drivers, because the " "first ones were really buggy.\n" @@ -3142,12 +3172,12 @@ "Si le dock est lancé avec l'OpenGl, essayez de le désactiver en le lançant " "avec \"cairo-dock -c\"." -#: ../data/messages:929 +#: ../data/messages:931 msgid "I don’t have these wonderful effects like fire, cube rotating, etc" msgstr "" "Je n'ai pas ces merveilleux effets comme le feu, la rotation en cube, etc" -#: ../data/messages:931 +#: ../data/messages:933 msgid "" "Hint : You can force the openGL by launching the dock with “cairo-dock –o”." "but you might get a lot of visual artifacts." @@ -3155,7 +3185,7 @@ "Astuce : vous pouvez forcer l'OpenGL en lançant le dock avec 'cairo-dock –o'." "Cependant vous risquez d'avoir de nombreux artefacts visuels." -#: ../data/messages:933 +#: ../data/messages:935 msgid "" "You need a graphic card with drivers that support openGL2.0. Most of Nvidia " "cards can do that, more and more Intel cards can do too. Most of ATI cards " @@ -3165,11 +3195,11 @@ "des cartes Nvidia peuvent faire ça, de plus en plus de cartes Intel aussi.\n" "La plupart des cartes ATI ne le peuvent pas." -#: ../data/messages:935 +#: ../data/messages:937 msgid "The “netspeed” applet displays 0 even when I’m downloading something" msgstr "L'applet 'netspeed' affiche 0 même quand je télécharge quelque chose" -#: ../data/messages:937 +#: ../data/messages:939 msgid "" "Hint : you can instantiate this applet many times if you want to monitor " "many interfaces." @@ -3177,7 +3207,7 @@ "Astuce : vous pouvez instancier cette applet plusieurs fois si vous voulez " "surveiller plusieurs interfaces." -#: ../data/messages:939 +#: ../data/messages:941 msgid "" "You have to tell it which interface you’re using to connect to the Net (by " "default, it’s “eth0”).\n" @@ -3192,11 +3222,11 @@ "\"loop\". C'est probablement quelque chose comme \"eth1\", \"ath0\", ou " "\"wifi0\"." -#: ../data/messages:941 +#: ../data/messages:943 msgid "The dustbin remains empty even when I delete a file" msgstr "La poubelle reste vide même quand je supprime un fichier" -#: ../data/messages:943 +#: ../data/messages:945 msgid "" "if you’re under KDE, you may have to tell it the path of the trash folder.\n" "Just edit the applet’s configuration, and fill in the Trash path; it is " @@ -3210,11 +3240,11 @@ "attention en indiquant un chemin ici !!! (n'insérez pas d'espace ou de " "caractères invisibles)." -#: ../data/messages:945 +#: ../data/messages:947 msgid "Help us !" msgstr "Aidez-nous !" -#: ../data/messages:947 +#: ../data/messages:949 msgid "" "We value your help ! If you see a bug, or if you think something could be " "improved,\n" @@ -3238,11 +3268,11 @@ # ################################# # ########### launcher.conf ############# # ################################# -#: ../data/messages:951 +#: ../data/messages:953 msgid "Launcher's name :" msgstr "Nom du lanceur :" -#: ../data/messages:953 +#: ../data/messages:955 msgid "" "Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard " "shortcut, for exemple F1 for the Applications Menu, c or v " @@ -3252,11 +3282,11 @@ "raccourci clavier, par exemple F1 pour le menu Applications, C ou " "V pour copier ou coller, etc..." -#: ../data/messages:955 +#: ../data/messages:957 msgid "Command to launch on click :" msgstr "Commande à exécuter au clic :" -#: ../data/messages:959 +#: ../data/messages:961 msgid "" "If you write here a container's name that doesn't exist yet, a new one will " "be created, with this icon inside." @@ -3264,7 +3294,7 @@ "Si vouz écrivez ici un nom d'un container qui n'existe pas encore, un " "nouveau sera créé, avec cette icône dedans." -#: ../data/messages:967 +#: ../data/messages:969 msgid "" "If you choosed to mix launcher and applis, this option will deactivate this " "behaviour for this launcher only. It can be useful for instance for a " @@ -3272,11 +3302,11 @@ "steal the Terminal's icon from the Taskbar." msgstr "" -#: ../data/messages:969 +#: ../data/messages:971 msgid "Prevent this launcher from stealing appli from taskbar ?" msgstr "Empêcher ce lanceur de voler l'appli de la barre des tâches ?" -#: ../data/messages:971 +#: ../data/messages:973 msgid "" "The only reason you may want to modify this parameter is if you made this " "launcher by hands. If you dropped it into the dock from the menu, it is " @@ -3289,20 +3319,24 @@ "définit la classe du programme, ce qui est utile pour lier l'appli avec son " "lanceur." -#: ../data/messages:973 +#: ../data/messages:975 msgid "Class of the program :" msgstr "Classe du programme :" -#: ../data/messages:975 +#: ../data/messages:977 +msgid "It will use 'xterm'." +msgstr "" + +#: ../data/messages:979 msgid "Run in a terminal ?" msgstr "Lancer dans un terminal ?" -#: ../data/messages:983 +#: ../data/messages:987 msgid "" "Choose the screen border regarding to which the dock will place itself :" msgstr "Choisissez le bord d'écran sur lequel le dock doit se placer" -#: ../data/messages:1007 +#: ../data/messages:1011 msgid "" "The dock will automatically hide itself outside of the scren when the mouse " "leaves it and will show a callback zone instead. Place the mouse into this " @@ -3315,27 +3349,27 @@ # ################################# # ########### themes.conf ############# # ################################# -#: ../data/messages:1021 +#: ../data/messages:1025 msgid "Themes" msgstr "Thèmes" -#: ../data/messages:1023 +#: ../data/messages:1027 msgid "Choose a theme" msgstr "Choisissez un thème" -#: ../data/messages:1025 +#: ../data/messages:1029 msgid "Choose one of the available themes :" msgstr "Choisissez un des thèmes disponibles :" -#: ../data/messages:1027 +#: ../data/messages:1031 msgid "You can even drop an internet URL." msgstr "Vous pouvez aussi " -#: ../data/messages:1029 +#: ../data/messages:1033 msgid "... or drag and drop a theme package here :" msgstr "... or glissez/déposez un package de thème ici" -#: ../data/messages:1031 +#: ../data/messages:1035 msgid "" "So if you check this box, your launchers will be deleted and replaced by the " "ones provided in the new theme. Otherwise the current launchers will be " @@ -3345,11 +3379,11 @@ "ceux fournis par le nouveau thème. Sinon les lanceurs actuels seront " "utilisés, et seules les icônes seront remplacées." -#: ../data/messages:1033 +#: ../data/messages:1037 msgid "Use the new theme's launchers ?" msgstr "Utiliser les lanceurs du nouveau thème ?" -#: ../data/messages:1035 +#: ../data/messages:1039 msgid "" "Otherwise the current behaviour will be kept. It's all about the dock's " "position, behaviour parameters such as auto-hide, using taskbar or not, etc." @@ -3358,35 +3392,35 @@ "position du dock, les paramètres de comportement tels que l'auto-hide, " "l'utilisation de la barre des tâches, etc" -#: ../data/messages:1037 +#: ../data/messages:1041 msgid "Use the new theme's behaviour ?" msgstr "Utiliser le comportement du nouveau thème ?" -#: ../data/messages:1039 +#: ../data/messages:1043 msgid "Save" msgstr "Enregistrer" -#: ../data/messages:1041 +#: ../data/messages:1045 msgid "Save current theme" msgstr "Enregistrez le thème actuel" -#: ../data/messages:1043 +#: ../data/messages:1047 msgid "You will then be able to re-open it at any time." msgstr "Vous pourrez ainsi le rouvrir à tout moment." -#: ../data/messages:1045 +#: ../data/messages:1049 msgid "Save as :" msgstr "Enregistrez sous :" -#: ../data/messages:1047 +#: ../data/messages:1051 msgid "Save current behaviour too ?" msgstr "Enregistrer aussi le comportement actuel ?" -#: ../data/messages:1049 +#: ../data/messages:1053 msgid "Save current launchers too ?" msgstr "Enregistrer aussi les lanceurs actuels ?" -#: ../data/messages:1051 +#: ../data/messages:1055 msgid "" "The dock will build a complete tarball of your current theme, allowing you " "to exchange it easily with other people." @@ -3394,28 +3428,28 @@ "Le dock va construire un tarball complet de votre thème actuel, vous " "permettant d'échanger votre thème facilement avec d'autres personnes." -#: ../data/messages:1053 +#: ../data/messages:1057 msgid "Build a package of the theme ?" msgstr "Construire un package du thème" -#: ../data/messages:1055 +#: ../data/messages:1059 msgid "Delete" msgstr "Effacer" -#: ../data/messages:1057 +#: ../data/messages:1061 msgid "List of your personnal themes" msgstr "Liste de vos thèmes perso" -#: ../data/messages:1059 +#: ../data/messages:1063 msgid "Delete from the list themes you don't want anymore :" msgstr "Supprimer de la liste les thèmes que vous ne voulez plus :" -#: ../data/messages:1061 +#: ../data/messages:1065 msgid "pouet" msgstr "pouet" -#: ../data/messages:1063 ../data/messages:1065 ../data/messages:1067 -#: ../data/messages:1069 +#: ../data/messages:1067 ../data/messages:1069 ../data/messages:1071 +#: ../data/messages:1073 msgid "" "v1.4.6.3 :\n" "Just to say :\n" @@ -3430,7 +3464,7 @@ # ################################# # ########### ChangeLog ############# # ################################# -#: ../data/messages:1071 +#: ../data/messages:1075 msgid "" "v1.5.0 : it's been 1 month since previous release, and we worked hardly to " "bring you :\n" @@ -3469,7 +3503,7 @@ " Maintenant, pourquoi ne pas essayer d'écrire une applet pour Cairo-" "Dock ? ;-)" -#: ../data/messages:1073 +#: ../data/messages:1077 msgid "" "v1.5.1 :\n" " - The 1.5 branch is still young, so this version brings a lot of bug fixes\n" @@ -3490,7 +3524,7 @@ " La plupart des applets peuvent se détacher du dock\n" " et se comporter comme de vrais desklets." -#: ../data/messages:1075 +#: ../data/messages:1079 msgid "" "v1.5.2.1 :\n" " - a lot of bug fixes, especially on desklets.\n" @@ -3503,7 +3537,7 @@ " - Cairo-Dock est maintenant complètement traduit en Japonais, grâce à Jiro " "Kawada !" -#: ../data/messages:1077 +#: ../data/messages:1081 msgid "" "v1.5.3.2 :\n" " - Themes have been deeply reviewed\n" @@ -3527,7 +3561,7 @@ " By the way, we are still searching someone\n" " who could help cairo-dock to be well-integrated into KDE ;-)" -#: ../data/messages:1079 +#: ../data/messages:1083 msgid "" "v1.5.4.2 : a huge release !\n" " - add a cute pinguin in your dock with the new applet Cairo-Penguin\n" @@ -3552,7 +3586,7 @@ " - rafraîchissez votre dock avec le nouveau thème Wood\n" " - 3 thèmes supplémentaires pour l'applet Weather." -#: ../data/messages:1081 +#: ../data/messages:1085 msgid "" "v1.5.5.4 :\n" " - Huge enhancements in the TaskBar :\n" @@ -3584,7 +3618,7 @@ " - Cairo-Dock n'est pas encore bien integré a Gnome 2.22, mais cela va venir " "bientôt ;-)" -#: ../data/messages:1083 +#: ../data/messages:1087 msgid "" "v1.5.6 :\n" " - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still " @@ -3618,7 +3652,7 @@ " - Corrections dans XGamma/Weather.\n" " - Toute aide est la bienvenue pour integrer le dock à KDE !" -#: ../data/messages:1085 +#: ../data/messages:1089 msgid "" "v1.6.0 :\n" " - A new view has appeared : Diapositive !\n" @@ -3653,7 +3687,7 @@ " - Relancement automatique en cas de plantage.\n" " - Vraies miniatures des fenêtres minimisées." -#: ../data/messages:1087 +#: ../data/messages:1091 msgid "" "v1.6.1 :\n" "Cairo-Dock has one year ! To celebrate this event, we are happy to offer " @@ -3673,7 +3707,7 @@ " - Et nous espérons toujours de l'aide pour écrire un plug-in kde-" "integration ^_^" -#: ../data/messages:1089 +#: ../data/messages:1093 msgid "" "v1.6.2 : the first version integrated in the Ubuntu repositories !\n" " - 2 new applets have been released :\n" @@ -3696,7 +3730,7 @@ " - Et nous recherchons toujours une personne motivée pour écrire un plugin " "kde-integration ^_^" -#: ../data/messages:1091 +#: ../data/messages:1095 msgid "" "v1.6.3 : \n" " - first the bad news :\n" @@ -3729,7 +3763,7 @@ " - Déplacement doux des icônes à la souris\n" " - Traduction en suédois et partiellement en grec" -#: ../data/messages:1093 +#: ../data/messages:1097 msgid "" "Cairo-Dock II\n" " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " @@ -3752,35 +3786,67 @@ " - Nouvelles applets : mail, keyboard indicator, quick folder, Toons.\n" " - Nombreuses corrections et améliorations dans tous les plug-ins." -#: ../data/messages:1095 +#: ../data/messages:1099 msgid "" -"Cairo-Dock II\n" -" - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " -"available for old graphic cards or ATI)\n" -" - New plug-ins provide many visual affects : Animated icons, icon effects, " -"illusion, drop indicator, motion blur, dialog rendering\n" -" - The config panel has been widely rewritten.\n" -" - Desklets are now in 3D\n" -" - New applets : mail, keyboard indicator, quick folder, Toons.\n" -" - Lot of bug fixes and upgrades in all plug-ins.\n" -" - 2.0.3 : some bug fixes + improvment of the config panel." -msgstr "" -"Cairo-Dock II\n" -" - Cairo-Dock est désormais un dock 100% OpenGL ! (le backend cairo est " -"toujours disponible pour les vieilles cartes graphiques et les ATI)\n" -" - De nouveaux plug-ins fournissent de nombreux effets visuels : Animated " -"icons, icon effects, illusion, drop indicator, motion blur, dialog " -"rendering\n" -" - Le panneau de config a été largement ré-écrit.\n" -" - Les desklets sont désormais en 3D\n" -" - Nouvelles applets : mail, keyboard indicator, quick folder, Toons.\n" -" - Nombreuses corrections et améliorations dans tous les plug-ins.\n" -" - 2.0.3 : quelques bug fixs + amelioration dans le panneau de conf." - -#~ msgid "Should the applications with same PID be displayed only once ?" +"2.0.5 :\n" +" - This is mainly a bug-fix version\n" +" - improvment in the RB applet\n" +" - Added functionnalities on grouped applications icons." +msgstr "" + +#~ msgid "" +#~ "Cairo-Dock II\n" +#~ " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " +#~ "available for old graphic cards or ATI)\n" +#~ " - New plug-ins provide many visual affects : Animated icons, icon " +#~ "effects, illusion, drop indicator, motion blur, dialog rendering\n" +#~ " - The config panel has been widely rewritten.\n" +#~ " - Desklets are now in 3D\n" +#~ " - New applets : mail, keyboard indicator, quick folder, Toons.\n" +#~ " - Lot of bug fixes and upgrades in all plug-ins.\n" +#~ " - 2.0.3 : some bug fixes + improvment of the config panel." +#~ msgstr "" +#~ "Cairo-Dock II\n" +#~ " - Cairo-Dock est désormais un dock 100% OpenGL ! (le backend cairo est " +#~ "toujours disponible pour les vieilles cartes graphiques et les ATI)\n" +#~ " - De nouveaux plug-ins fournissent de nombreux effets visuels : Animated " +#~ "icons, icon effects, illusion, drop indicator, motion blur, dialog " +#~ "rendering\n" +#~ " - Le panneau de config a été largement ré-écrit.\n" +#~ " - Les desklets sont désormais en 3D\n" +#~ " - Nouvelles applets : mail, keyboard indicator, quick folder, Toons.\n" +#~ " - Nombreuses corrections et améliorations dans tous les plug-ins.\n" +#~ " - 2.0.3 : quelques bug fixs + amelioration dans le panneau de conf." + +#~ msgid "< Safe Mode >" +#~ msgstr "< Mode sûreté >" + +#~ msgid "" +#~ "You are running Cairo-Dock in safe mode.\n" +#~ "Why ? Probably because a plug-in has messed into your dock,\n" +#~ " or maybe your theme has got corrupted.\n" +#~ "So, no plug-in will be available, and you can now save your current theme " +#~ "if you want\n" +#~ " before you start using the dock.\n" +#~ "Try with your current theme, if it works, it means a plug-in is wrong.\n" +#~ "Otherwise, try with another theme.\n" +#~ "Save a config that is working, and restart the dock in normal mode.\n" +#~ "Then, activate plug-ins one by one to guess which one is wrong." #~ msgstr "" -#~ "Les applications avec le même PID ne devraient être affichées qu'une " -#~ "seule fois ?" +#~ "Vous exécutez Cairo-dock en mode sécurité.\n" +#~ "Pourquoi ? Probablement à cause d'un plug-in qui pose problème avec votre " +#~ "dock,\n" +#~ " ou peut-être parce que votre thème a été corrompu.\n" +#~ "Donc, aucun plug-in ne sera disponible, and vous pouvez voir votre thème " +#~ "courant si vous voulez\n" +#~ " avant de commencer à utiliser le dock.\n" +#~ "Essayez avec votre thème personnel, si cela fonctionne, cela signifie " +#~ "qu'un plug-in pose problème.\n" +#~ "Sinon, utilisez un autre thème.\n" +#~ "Sauvegardez votre configuration fonctionnelle, and redémarrez le dock en " +#~ "mode normal.\n" +#~ "Ensuite, activez les plug-ins un à un pour déterminer lequel pose " +#~ "problème." -#~ msgid "Configure the decorator :" -#~ msgstr "Configurer le décorateur" +#~ msgid "Hint : " +#~ msgstr "Astuce :" diff -Nru cairo-dock-2.0.3/po/it.po cairo-dock-2.0.5/po/it.po --- cairo-dock-2.0.3/po/it.po 2009-05-23 02:54:58.000000000 +0200 +++ cairo-dock-2.0.5/po/it.po 2009-06-10 02:31:42.000000000 +0200 @@ -16,14 +16,10 @@ "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/cairo-dock-callbacks.c:1184 +#: ../src/cairo-dock-callbacks.c:1181 msgid "Do you want to mount this point ?" msgstr "Volete montare questo punto ?" -#: ../src/cairo-dock-callbacks.c:1773 -msgid "Quit Cairo-Dock ?" -msgstr "Uscire da Cairo-Dock ?" - #: ../src/cairo-dock-desktop-file-factory.c:158 msgid "Do you want to monitor the content of the directory ?" msgstr "Sorvegliare il contenuto di questa cartella ?" @@ -75,7 +71,7 @@ "Assicuratevi di averlo installato nella stessa versione della barraper " "utilizzare le sue opzioni." -#: ../src/cairo-dock-gui-factory.c:715 +#: ../src/cairo-dock-gui-factory.c:722 #, c-format msgid "" "The '%s' plug-in is not active.\n" @@ -84,75 +80,75 @@ "Il plug-in '%s' non è attivo.\n" "Assicuratevi di averlo attivato per utilizzare le sue opzioni." -#: ../src/cairo-dock-gui-factory.c:1710 +#: ../src/cairo-dock-gui-factory.c:1719 msgid "grab" msgstr "recupera" -#: ../src/cairo-dock-gui-manager.c:72 ../data/messages:89 +#: ../src/cairo-dock-gui-manager.c:73 ../data/messages:89 msgid "Behaviour" msgstr "Comportamento" -#: ../src/cairo-dock-gui-manager.c:73 +#: ../src/cairo-dock-gui-manager.c:74 msgid "Appearance" msgstr "Aspetto" -#: ../src/cairo-dock-gui-manager.c:74 +#: ../src/cairo-dock-gui-manager.c:75 msgid "Accessories" msgstr "Accessori" -#: ../src/cairo-dock-gui-manager.c:75 +#: ../src/cairo-dock-gui-manager.c:76 msgid "Desktop" msgstr "Desktop" -#: ../src/cairo-dock-gui-manager.c:76 +#: ../src/cairo-dock-gui-manager.c:77 msgid "Controlers" msgstr "Controlli" -#: ../src/cairo-dock-gui-manager.c:77 +#: ../src/cairo-dock-gui-manager.c:78 msgid "Plug-ins" msgstr "Plug-ins" -#: ../src/cairo-dock-gui-manager.c:406 +#: ../src/cairo-dock-gui-manager.c:407 msgid "Categories" msgstr "Categorie" -#: ../src/cairo-dock-gui-manager.c:427 +#: ../src/cairo-dock-gui-manager.c:428 msgid "All" msgstr "Tutti" -#: ../src/cairo-dock-gui-manager.c:533 +#: ../src/cairo-dock-gui-manager.c:534 msgid "Activate this module" msgstr "Attiva questo modulo" -#: ../src/cairo-dock-gui-manager.c:551 +#: ../src/cairo-dock-gui-manager.c:552 msgid "Filter" msgstr "Filtri" -#: ../src/cairo-dock-gui-manager.c:591 +#: ../src/cairo-dock-gui-manager.c:592 msgid "All words" msgstr "Tutte le parole" -#: ../src/cairo-dock-gui-manager.c:598 +#: ../src/cairo-dock-gui-manager.c:599 msgid "Highlight words" msgstr "Parole evidenziate" -#: ../src/cairo-dock-gui-manager.c:606 +#: ../src/cairo-dock-gui-manager.c:607 msgid "Hide others" msgstr "Nascondi il resto" -#: ../src/cairo-dock-gui-manager.c:614 +#: ../src/cairo-dock-gui-manager.c:615 msgid "Search in description" msgstr "Cerca nella descrizione" -#: ../src/cairo-dock-gui-manager.c:677 +#: ../src/cairo-dock-gui-manager.c:686 msgid "< Maintenance mode >" msgstr "< Modalità manutenzione >" -#: ../src/cairo-dock-gui-manager.c:695 ../src/cairo-dock-gui-manager.c:766 +#: ../src/cairo-dock-gui-manager.c:704 ../src/cairo-dock-gui-manager.c:775 msgid "Configuration of Cairo-Dock" msgstr "Configurazione di Cairo-Dock" -#: ../src/cairo-dock-gui-manager.c:1004 +#: ../src/cairo-dock-gui-manager.c:1013 #, c-format msgid "" "The module '%s' is not present. You need to install it or its dependencies " @@ -161,17 +157,17 @@ "Il modulo '%s' manca. Occorre installare lui o le sue dipendenze per carpire " "il meglio da questo modulo." -#: ../src/cairo-dock-gui-manager.c:1010 +#: ../src/cairo-dock-gui-manager.c:1019 #, c-format msgid "The module '%s' is not activated." msgstr "Il modulo '%s' non è attivato." -#: ../src/cairo-dock-gui-manager.c:1011 +#: ../src/cairo-dock-gui-manager.c:1020 msgid "Do you want to activate it now ?" msgstr "Vuoi attivarlo ora ?" #: ../src/cairo-dock-internal-accessibility.c:170 -#: ../src/cairo-dock-menu.c:1409 ../data/messages:39 +#: ../src/cairo-dock-menu.c:1562 ../data/messages:39 msgid "Accessibility" msgstr "Accessibilità" @@ -220,16 +216,16 @@ msgid "Define the appearance of the dock when it's hidden." msgstr "Configura l'aspetto della barra quando nascosta." -#: ../src/cairo-dock-internal-icons.c:337 +#: ../src/cairo-dock-internal-icons.c:348 msgid "It provides many animations to your icons." msgstr "Fornisce molte animazioni per le vostre icone." -#: ../src/cairo-dock-internal-icons.c:339 ../data/messages:355 +#: ../src/cairo-dock-internal-icons.c:350 ../data/messages:355 #: ../data/messages:665 msgid "Icons" msgstr "Icone" -#: ../src/cairo-dock-internal-icons.c:341 +#: ../src/cairo-dock-internal-icons.c:352 msgid "" "All about icons :\n" " size, reflection, icon theme, ..." @@ -254,12 +250,12 @@ # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-internal-position.c:95 ../data/messages:1 -#: ../data/messages:977 +#: ../src/cairo-dock-internal-position.c:96 ../data/messages:1 +#: ../data/messages:981 msgid "Position" msgstr "Posizionamento" -#: ../src/cairo-dock-internal-position.c:97 +#: ../src/cairo-dock-internal-position.c:98 msgid "Set the position of the main dock." msgstr "Regola la posizione della barra principale" @@ -295,19 +291,23 @@ msgid "Select a view for each of your docks." msgstr "Scegli una vista per ciascuna barra." -#: ../src/cairo-dock-menu.c:142 +#: ../src/cairo-dock-menu.c:139 msgid "Development" msgstr "Sviluppo" -#: ../src/cairo-dock-menu.c:148 +#: ../src/cairo-dock-menu.c:145 msgid "Artwork" msgstr "Artwork" -#: ../src/cairo-dock-menu.c:152 +#: ../src/cairo-dock-menu.c:149 msgid "Support" msgstr "Supporto" -#: ../src/cairo-dock-menu.c:237 +#: ../src/cairo-dock-menu.c:231 +msgid "Quit Cairo-Dock ?" +msgstr "Uscire da Cairo-Dock ?" + +#: ../src/cairo-dock-menu.c:246 msgid "" "Do you want to re-dispatch the icons contained inside this container into " "the dock ?\n" @@ -316,24 +316,24 @@ "Volete suddividere le icone contenute in questo contenitore nella barra ?\n" " (altrimenti saranno distrutte)" -#: ../src/cairo-dock-menu.c:258 +#: ../src/cairo-dock-menu.c:267 #, c-format msgid "You're about removing this icon (%s) from the dock. Sure ?" msgstr "State rimuovendo questa icona (%s) dalla barra. Sicuri ?" -#: ../src/cairo-dock-menu.c:314 +#: ../src/cairo-dock-menu.c:323 msgid "Fill this launcher" msgstr "Riempi questo lanciatore" -#: ../src/cairo-dock-menu.c:326 +#: ../src/cairo-dock-menu.c:335 msgid "Undefined" msgstr "Non definito" -#: ../src/cairo-dock-menu.c:478 ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:487 ../src/cairo-dock-menu.c:1448 msgid "Modify this launcher" msgstr "Modifica questo lanciatore" -#: ../src/cairo-dock-menu.c:620 +#: ../src/cairo-dock-menu.c:629 #, c-format msgid "" "You're about deleting this file\n" @@ -344,7 +344,7 @@ " (%s)\n" "dal vostro hard disk. Sicuri ?" -#: ../src/cairo-dock-menu.c:629 +#: ../src/cairo-dock-menu.c:638 msgid "" "Attention : couldn't delete this file.\n" "Check that you have writing rights on it." @@ -352,11 +352,11 @@ "Attenzione: impossibile cancellare questo file\n" " Verificare i vostri diritti di scrittura su esso." -#: ../src/cairo-dock-menu.c:653 +#: ../src/cairo-dock-menu.c:662 msgid "Rename to :" msgstr "Rinomina in :" -#: ../src/cairo-dock-menu.c:660 +#: ../src/cairo-dock-menu.c:669 #, c-format msgid "" "Attention : couldn't rename %s.\n" @@ -367,272 +367,318 @@ "Verificare i vostri diritti di scrittura su esso,\n" " e che il nome scelto non esista già." -#: ../src/cairo-dock-menu.c:705 +#: ../src/cairo-dock-menu.c:714 #, c-format msgid "You're about removing this applet (%s) from the dock. Sure ?" msgstr "State per rimuovere questo applet (%s) dalla barra. Sicuri ?" -#: ../src/cairo-dock-menu.c:1034 +#: ../src/cairo-dock-menu.c:840 +msgid "" +"Sorry, couldn't find the corresponding description file.\n" +"Consider drag and dropping the launcher from the Applications Menu." +msgstr "" + +#: ../src/cairo-dock-menu.c:1166 #, c-format msgid "Set position for the dock '%s'" msgstr "Regola la posizione della barra '%s'" -#: ../src/cairo-dock-menu.c:1117 +#: ../src/cairo-dock-menu.c:1249 msgid "Configure" msgstr "Configura..." -#: ../src/cairo-dock-menu.c:1124 +#: ../src/cairo-dock-menu.c:1256 msgid "Set up this dock" msgstr "Regolare questa barra" -#: ../src/cairo-dock-menu.c:1126 +#: ../src/cairo-dock-menu.c:1258 msgid "Manage themes" msgstr "Gestione dei temi..." -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "unlock icons" msgstr "Sblocca le icone" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "lock icons" msgstr "Blocca le icone" -#: ../src/cairo-dock-menu.c:1139 +#: ../src/cairo-dock-menu.c:1271 msgid "Quick-Hide" msgstr "Nascondi ora" -#: ../src/cairo-dock-menu.c:1147 +#: ../src/cairo-dock-menu.c:1279 msgid "Launch Cairo-Dock on startup" msgstr "" -#: ../src/cairo-dock-menu.c:1153 +#: ../src/cairo-dock-menu.c:1285 msgid "Development's site" msgstr "Sito di sviluppo" -#: ../src/cairo-dock-menu.c:1155 +#: ../src/cairo-dock-menu.c:1287 msgid "Community's site" msgstr "Sito della comunità" -#: ../src/cairo-dock-menu.c:1157 +#: ../src/cairo-dock-menu.c:1289 msgid "Help" msgstr "Aiuto" -#: ../src/cairo-dock-menu.c:1159 +#: ../src/cairo-dock-menu.c:1291 msgid "About" msgstr "Informazioni..." -#: ../src/cairo-dock-menu.c:1163 +#: ../src/cairo-dock-menu.c:1295 msgid "Quit" msgstr "Esci" -#: ../src/cairo-dock-menu.c:1191 ../src/cairo-dock-menu.c:1253 +#: ../src/cairo-dock-menu.c:1315 +#, fuzzy, c-format +msgid "Move all to desktop %d - face %d" +msgstr "Sposta nel desktop %d - faccia %d" + +#: ../src/cairo-dock-menu.c:1315 +#, c-format +msgid "Move to desktop %d - face %d" +msgstr "Sposta nel desktop %d - faccia %d" + +#: ../src/cairo-dock-menu.c:1317 +#, fuzzy, c-format +msgid "Move all to desktop %d" +msgstr "Sposta nel desktop %d" + +#: ../src/cairo-dock-menu.c:1317 +#, c-format +msgid "Move to desktop %d" +msgstr "Sposta nel desktop %d" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Move all to face %d" +msgstr "Sposta verso la faccia %d" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Moveto face %d" +msgstr "Sposta verso la faccia %d" + +#: ../src/cairo-dock-menu.c:1368 ../src/cairo-dock-menu.c:1430 msgid "Add a manual launcher" msgstr "Aggiungi un lanciatore" -#: ../src/cairo-dock-menu.c:1192 ../src/cairo-dock-menu.c:1254 +#: ../src/cairo-dock-menu.c:1369 ../src/cairo-dock-menu.c:1431 msgid "" "Don't forget you can drag a launcher from the menu and drop it in the dock !" msgstr "" "Non dimenticate che è possibile trascinare un lanciatore partendo dal menù e " "posandolo nella barra !" -#: ../src/cairo-dock-menu.c:1194 ../src/cairo-dock-menu.c:1256 +#: ../src/cairo-dock-menu.c:1371 ../src/cairo-dock-menu.c:1433 msgid "Add a sub-dock" msgstr "Aggiungi una sotto-barra" -#: ../src/cairo-dock-menu.c:1198 ../src/cairo-dock-menu.c:1260 +#: ../src/cairo-dock-menu.c:1375 ../src/cairo-dock-menu.c:1437 msgid "Add a separator" msgstr "Aggiungi un separatore" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Unmount" msgstr "Smonta" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Mount" msgstr "Monta" -#: ../src/cairo-dock-menu.c:1224 +#: ../src/cairo-dock-menu.c:1401 msgid "Eject" msgstr "Espelli" -#: ../src/cairo-dock-menu.c:1231 +#: ../src/cairo-dock-menu.c:1408 msgid "Delete this file" msgstr "Cancella questo file" -#: ../src/cairo-dock-menu.c:1235 +#: ../src/cairo-dock-menu.c:1412 msgid "Rename this file" msgstr "Rinomina questo file" -#: ../src/cairo-dock-menu.c:1239 +#: ../src/cairo-dock-menu.c:1416 msgid "Properties" msgstr "Proprietà" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this separator" msgstr "Rimuovi questo separatore" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this launcher" msgstr "Rimuovi questo lanciatore" -#: ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:1448 msgid "Modify this separator" msgstr "Modifica questo separatore" -#: ../src/cairo-dock-menu.c:1281 +#: ../src/cairo-dock-menu.c:1459 ../src/cairo-dock-menu.c:1503 msgid "Other actions" msgstr "Altre azioni" -#: ../src/cairo-dock-menu.c:1286 +#: ../src/cairo-dock-menu.c:1464 msgid "Move to this desktop" msgstr "Sposta in questo desktop" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Not Fullscreen" msgstr "Non a tutto schermo" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Fullscreen" msgstr "A tutto schermo" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Don't keep above" msgstr "Non tenere al di sopra" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Keep above" msgstr "Tieni al di sopra" -#: ../src/cairo-dock-menu.c:1300 -#, c-format -msgid "Move to desktop %d - face %d" -msgstr "Sposta nel desktop %d - faccia %d" - -#: ../src/cairo-dock-menu.c:1302 -#, c-format -msgid "Move to desktop %d" -msgstr "Sposta nel desktop %d" - -#: ../src/cairo-dock-menu.c:1304 -#, c-format -msgid "Move to face %d" -msgstr "Sposta verso la faccia %d" - -#: ../src/cairo-dock-menu.c:1335 +#: ../src/cairo-dock-menu.c:1475 msgid "Kill" msgstr "Kill" -#: ../src/cairo-dock-menu.c:1341 ../src/cairo-dock-menu.c:1365 +#: ../src/cairo-dock-menu.c:1480 ../src/cairo-dock-menu.c:1514 msgid "Launch new" msgstr "Lanciane uno nuovo" -#: ../src/cairo-dock-menu.c:1346 +#: ../src/cairo-dock-menu.c:1485 #, fuzzy msgid "Make it a launcher" msgstr "Modifica questo lanciatore" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Unmaximize" msgstr "Demassimizza" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Maximize" msgstr "Massimizza" -#: ../src/cairo-dock-menu.c:1352 +#: ../src/cairo-dock-menu.c:1491 msgid "Show" msgstr "Mostra" -#: ../src/cairo-dock-menu.c:1354 +#: ../src/cairo-dock-menu.c:1493 msgid "Minimize" msgstr "Minimizza" -#: ../src/cairo-dock-menu.c:1356 +#: ../src/cairo-dock-menu.c:1495 msgid "Close" msgstr "Chiudi" -#: ../src/cairo-dock-menu.c:1368 +#: ../src/cairo-dock-menu.c:1508 +#, fuzzy +msgid "Move all to this desktop" +msgstr "Sposta in questo desktop" + +#: ../src/cairo-dock-menu.c:1517 +#, fuzzy +msgid "Show all" +msgstr "Mostra" + +#: ../src/cairo-dock-menu.c:1519 +#, fuzzy +msgid "Minimize all" +msgstr "Minimizza" + +#: ../src/cairo-dock-menu.c:1521 #, fuzzy msgid "Close all" msgstr "Chiudi" -#: ../src/cairo-dock-menu.c:1387 +#: ../src/cairo-dock-menu.c:1540 msgid "Configure this applet" msgstr "Configura questo applet" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Detach this applet" msgstr "Sgancia questo applet dalla barra" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Return to dock" msgstr "Ritorna alla barra" -#: ../src/cairo-dock-menu.c:1394 +#: ../src/cairo-dock-menu.c:1547 msgid "Remove this applet" msgstr "Rimuovi questo applet" -#: ../src/cairo-dock-menu.c:1398 +#: ../src/cairo-dock-menu.c:1551 msgid "Launch another instance of this applet" msgstr "Lancia un'altra istanza dell'applet" -#: ../src/cairo-dock-menu.c:1426 +#: ../src/cairo-dock-menu.c:1579 msgid "Normal" msgstr "Normale" -#: ../src/cairo-dock-menu.c:1433 +#: ../src/cairo-dock-menu.c:1586 msgid "Always on top" msgstr "Sempre in primo piano" -#: ../src/cairo-dock-menu.c:1440 +#: ../src/cairo-dock-menu.c:1593 msgid "Always below" msgstr "Sempre al di sotto" -#: ../src/cairo-dock-menu.c:1456 +#: ../src/cairo-dock-menu.c:1606 #, fuzzy msgid "set behaviour in Compiz to: (name=cairo-dock & type=utility)" msgstr "" "Regolate il comportamento di Compiz in : (name=cairo-dock & type=utility)" -#: ../src/cairo-dock-menu.c:1458 +#: ../src/cairo-dock-menu.c:1608 msgid "Reserve space" msgstr "" -#: ../src/cairo-dock-menu.c:1465 +#: ../src/cairo-dock-menu.c:1615 msgid "On all desktops" msgstr "" # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-menu.c:1471 +#: ../src/cairo-dock-menu.c:1621 #, fuzzy msgid "Lock position" msgstr "Composizione" -#: ../src/cairo-dock-modules.c:107 +#: ../src/cairo-dock-modules.c:108 msgid "" "A useful FAQ that contains also a lot of hints.\n" "Let the mouse over a sentence to make the hint dialog popups." msgstr "" -#: ../src/cairo-dock-themes-manager.c:439 +#: ../src/cairo-dock-themes-manager.c:145 +#, c-format +msgid "Downloading file %s ..." +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:186 +#, c-format +msgid "couldn't get distant file %s" +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:468 #, c-format msgid "Are you sure you want to overwrite theme %s ?" msgstr "Siete sicuri di voler sovrascrivere il tema %s ?" -#: ../src/cairo-dock-themes-manager.c:537 +#: ../src/cairo-dock-themes-manager.c:566 #, c-format msgid "Are you sure you want to delete theme %s ?" msgstr "Siete sicuri di voler cancellare il tema %s ?" -#: ../src/cairo-dock-themes-manager.c:539 +#: ../src/cairo-dock-themes-manager.c:568 #, fuzzy msgid "Are you sure you want to delete these themes ?" msgstr "Siete sicuri di voler cancellare il tema %s ?" -#: ../src/cairo-dock-themes-manager.c:601 +#: ../src/cairo-dock-themes-manager.c:630 msgid "" "You made some modifications in the current theme.\n" "You will loose them if you don't save before choosing a new theme. Continue " @@ -642,48 +688,23 @@ "Le perderete se non salvate il tema prima di sceglierne uno nuovo. " "Continuare ugualmente ?" -#: ../src/cairo-dock-themes-manager.c:637 +#: ../src/cairo-dock-themes-manager.c:666 #, c-format msgid "" "couldn't get distant file %s/%s, maybe the server is down.\n" "Please retry later or contact us at cairo-dock.org." msgstr "" -#: ../src/cairo-dock-themes-manager.c:807 -msgid "< Safe Mode >" -msgstr "< Modalità di sicurezza >" - -#: ../src/cairo-dock-themes-manager.c:807 +#: ../src/cairo-dock-themes-manager.c:858 msgid "Manage Themes" msgstr "Gestione dei Temi" -#: ../src/cairo-dock-themes-manager.c:812 -msgid "" -"You are running Cairo-Dock in safe mode.\n" -"Why ? Probably because a plug-in has messed into your dock,\n" -" or maybe your theme has got corrupted.\n" -"So, no plug-in will be available, and you can now save your current theme if " -"you want\n" -" before you start using the dock.\n" -"Try with your current theme, if it works, it means a plug-in is wrong.\n" -"Otherwise, try with another theme.\n" -"Save a config that is working, and restart the dock in normal mode.\n" -"Then, activate plug-ins one by one to guess which one is wrong." -msgstr "" -"State eseguendo Cairo-dock in modalità di sicurezza.\n" -"Perché ? Probabilmente a causa di un plug-in che crea problemi alla barra,\n" -" o può essere che il vostro tema sia corrotto.\n" -"Perciò nessun plug-in sarà disponibile, e voi potete salvare il vostro tema " -"corrente se lo volete,\n" -" prima di utilizzare la barra.\n" -"Poi provate col vostro tema e se funziona significa che è un plug-in che " -"causa conflitti.\n" -"Altrimenti utilizzate un altro tema.\n" -"Salvate una configurazine della barra funzionante, e rilanciate la barra in " -"modo normale.\n" -"Successivamente attivate uno ad uno i plug-in per capire quale crea problemi." +#: ../src/cairo-dock-themes-manager.c:902 +#, c-format +msgid "couldn't retrieve distant theme %s" +msgstr "" -#: ../src/cairo-dock.c:616 +#: ../src/cairo-dock.c:608 msgid "" "Welcome in Cairo-Dock2 !\n" "A default and simple theme has been loaded.\n" @@ -696,11 +717,11 @@ " (you can now click on this dialog to close it)" msgstr "" -#: ../data/messages:3 ../data/messages:979 +#: ../data/messages:3 ../data/messages:983 msgid "Position on the screen" msgstr "Posizionamento sullo schermo" -#: ../data/messages:5 ../data/messages:981 +#: ../data/messages:5 ../data/messages:985 msgid "" "The icons will scroll according to the chosen placement type. Of course the " "dock can be placed anywhere on the screen, here we specify regarding to what." @@ -716,23 +737,23 @@ "Scegliere il bordo dello schermo in rapporto al quale la barra verrà " "piazzata:" -#: ../data/messages:9 ../data/messages:985 +#: ../data/messages:9 ../data/messages:989 msgid "bottom" msgstr "basso" -#: ../data/messages:11 ../data/messages:987 +#: ../data/messages:11 ../data/messages:991 msgid "top" msgstr "alto" -#: ../data/messages:13 ../data/messages:989 +#: ../data/messages:13 ../data/messages:993 msgid "right" msgstr "destra" -#: ../data/messages:15 ../data/messages:991 +#: ../data/messages:15 ../data/messages:995 msgid "left" msgstr "sinistra" -#: ../data/messages:17 ../data/messages:993 +#: ../data/messages:17 ../data/messages:997 msgid "" "At 0, the dock will place itself regarding the left corner if horizontal and " "the top corner if vertical, at 1 regarding the right corner if horizontal " @@ -744,15 +765,15 @@ "orizzontale (angolo basso in verticale), e a 0.5 in mezzo alla parte bassa " "dello schermo." -#: ../data/messages:19 ../data/messages:995 +#: ../data/messages:19 ../data/messages:999 msgid "Relative alignment :" msgstr "Allineamento relativo :" -#: ../data/messages:21 ../data/messages:997 +#: ../data/messages:21 ../data/messages:1001 msgid "Position regarding the chosen screen's edge" msgstr "Posizionamento in rapporto al bordo scelto dello schermo" -#: ../data/messages:23 ../data/messages:999 +#: ../data/messages:23 ../data/messages:1003 msgid "" "Gap from the absolute position on the screen's edge, in pixels. You can also " "move the dock by holding ALT or CTRL key and left mouse button." @@ -761,11 +782,11 @@ "Potete anche muovere la barra premendo ALT o CTRL e il tasto sinistro del " "mouse" -#: ../data/messages:25 ../data/messages:1001 +#: ../data/messages:25 ../data/messages:1005 msgid "Lateral gap :" msgstr "Scarto laterale :" -#: ../data/messages:27 ../data/messages:1003 +#: ../data/messages:27 ../data/messages:1007 msgid "" "in pixels. You can also move the dock by holding ALT or CTRL key and left " "mouse button." @@ -773,7 +794,7 @@ "in pixel. Potete anche muovere la barra premendo ALT o CTRL e il tasto " "sinistro del mouse." -#: ../data/messages:29 ../data/messages:1005 +#: ../data/messages:29 ../data/messages:1009 msgid "Distance to the screen's edge :" msgstr "Distanza dai bordi dello schermo :" @@ -837,7 +858,7 @@ "lascerà, e mostrerà una zona per ricordarla al suo posto. Posizionare il " "mouse in quella zona farà riapparire la barra." -#: ../data/messages:55 ../data/messages:1009 +#: ../data/messages:55 ../data/messages:1013 msgid "Activate auto-hide ?" msgstr "Attivare l'auto-nascondimento ?" @@ -2155,7 +2176,7 @@ msgid "Name of an image to use for the locked emblem :" msgstr "Nome dell'immagine da usare per il simbolo 'bloccato' :" -#: ../data/messages:651 ../data/messages:949 ../data/messages:1011 +#: ../data/messages:651 ../data/messages:951 ../data/messages:1015 msgid "Desktop Entry" msgstr "Elementi del desktop" @@ -2163,19 +2184,19 @@ msgid "Sub-dock's name :" msgstr "Nome della sotto-barra:" -#: ../data/messages:655 ../data/messages:957 ../data/messages:1013 +#: ../data/messages:655 ../data/messages:959 ../data/messages:1017 msgid "Image's name or path :" msgstr "Percorso o nome dell'immagine:" -#: ../data/messages:657 ../data/messages:963 ../data/messages:1015 +#: ../data/messages:657 ../data/messages:965 ../data/messages:1019 msgid "Extra parameters" msgstr "Altri parametri" -#: ../data/messages:659 ../data/messages:965 ../data/messages:1017 +#: ../data/messages:659 ../data/messages:967 ../data/messages:1021 msgid "Order you want for this launcher among the others:" msgstr "Ordine di questo lanciatore tra gli altri :" -#: ../data/messages:661 ../data/messages:961 ../data/messages:1019 +#: ../data/messages:661 ../data/messages:963 ../data/messages:1023 msgid "Name of the container it belongs to:" msgstr "Nome del contenitore al quale appartiene :" @@ -2700,7 +2721,8 @@ #: ../data/messages:813 msgid "" -"Hint : to launch another instance of theprogram, shift+click on the launcher." +"Hint : to launch another instance of the program, shift+click on the " +"launcher." msgstr "" "Suggerimento : per lanciare un'altra istanza del programma, SHIFT+click sul " "lanciatore." @@ -2734,25 +2756,30 @@ #: ../data/messages:821 msgid "" +"How can I quickly navigate between many windows of the same application ?" +msgstr "" + +#: ../data/messages:823 +msgid "" "Hint : you can also close all the windows of this appli by middle-clicking " "on the icon pointing on the sub-dock." msgstr "" -#: ../data/messages:823 +#: ../data/messages:825 msgid "" -"croll on the icon of one of the windows of this appli, or even on the icon " +"Scroll on the icon of one of the windows of this appli, or even on the icon " "pointing on the sub-dock if you group windows in a sub-dock." msgstr "" -#: ../data/messages:825 +#: ../data/messages:827 msgid "Replacing the gnome-panel" msgstr "Sostituire lo gnome-panel" -#: ../data/messages:827 +#: ../data/messages:829 msgid "How can I have the main menu ?" msgstr "Posso avere un menu principale ?" -#: ../data/messages:829 +#: ../data/messages:831 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F1” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the menu at the " @@ -2762,15 +2789,15 @@ "più. Questo applet vi permette di scegliere una shortcut per aprire il menù " "alla posizione del mose." -#: ../data/messages:831 +#: ../data/messages:833 msgid "activate the Gmenu applet." msgstr "Attivare l'applet Gmenu" -#: ../data/messages:833 +#: ../data/messages:835 msgid "How can I have a simple “quick launch” panel ?" msgstr "Come posso far apparire un semplice dialogo 'Esegui comando' ?" -#: ../data/messages:835 +#: ../data/messages:837 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F2” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the quick-" @@ -2780,7 +2807,7 @@ "più. Questo applet vi permette di scegliere una shortcut per aprire il " "dialogo 'Esegui comando'" -#: ../data/messages:837 +#: ../data/messages:839 msgid "" "activate the Gmenu applet, then you can have it by middle-clicking on its " "icon." @@ -2788,11 +2815,11 @@ "attivate l'applet Gmenu, quindi potete averlo facendo click col tasto " "centrale sulla sua icona." -#: ../data/messages:839 +#: ../data/messages:841 msgid "How can I have a logout icon ?" msgstr "Posso avere un'icona per il logout ?" -#: ../data/messages:841 +#: ../data/messages:843 msgid "" "Hint : In the last Gnome version, there are 2 panel : one to logout, and one " "to turn off computer. The first one is raised by a click on the icon, the " @@ -2805,15 +2832,15 @@ "di scambiare questo ordine, e anche di usare dei vostri comandi " "personalizzati." -#: ../data/messages:843 +#: ../data/messages:845 msgid "Simply activate the “logout” applet." msgstr "Semplicemente, attivate l'applet 'logout'." -#: ../data/messages:845 +#: ../data/messages:847 msgid "How can I access the dustbin ?" msgstr "Come posso raggiungere il Cestino ?" -#: ../data/messages:847 +#: ../data/messages:849 msgid "" "Hint : you can delete a file by dragging it into the dustbin. You can even " "unmount a mount-point this way !" @@ -2821,15 +2848,15 @@ "Suggerimento : potete cancellare un file trascinandolo nel cestino. Potete " "anche smontare un mount-point in questo modo !" -#: ../data/messages:849 +#: ../data/messages:851 msgid "Simply activate the “dustbin” applet." msgstr "Semplicemente attivate l'applet 'Cestino'." -#: ../data/messages:851 +#: ../data/messages:853 msgid "How can I access to my mount points ?" msgstr "Come posso accedere ai miei mount-points ?" -#: ../data/messages:853 +#: ../data/messages:855 msgid "" "Hint : you can mount a volume by clicking on its icon. To unmount it, right-" "click and select “unmount”." @@ -2837,15 +2864,15 @@ "Suggerimento : potete montare un'unità cliccando sulla sua icona. Per " "smontarla, click destro e scegliete 'Smonta'." -#: ../data/messages:855 ../data/messages:861 +#: ../data/messages:857 ../data/messages:863 msgid "Simply activate the “shortcuts” applet." msgstr "Semplicemente attivate l'applet 'Shortcut'." -#: ../data/messages:857 +#: ../data/messages:859 msgid "How can I access to my Nautilus bookmarks ?" msgstr "Come posso acceder i miei Segnalibri di Nautilus ?" -#: ../data/messages:859 +#: ../data/messages:861 msgid "" "Hint : you can add a bookmark by dragging the folder onto the applet or into " "its sub-dock. You can also rename and remove them. This will also take " @@ -2855,26 +2882,26 @@ "sull'applet o su una sotto-barra. Potete anche rinominarlo o eliminarlo. " "Questo avrà effetto immediato in Nautilus, e vice versa." -#: ../data/messages:863 +#: ../data/messages:865 msgid "How can I access to my desktop ?" msgstr "Come posso accedere al mio desktop ?" -#: ../data/messages:865 +#: ../data/messages:867 msgid "" "Hint : middle-clicking on it will hide all the windows, but not the desklets." msgstr "" "Click col tasto centrale sull'applet nasconderà tutte le finestre, ma non le " "desklet." -#: ../data/messages:867 +#: ../data/messages:869 msgid "Simply activate the “show desktop” applet." msgstr "Semplicemente attivate l'applet 'Mostra il desktop'." -#: ../data/messages:869 +#: ../data/messages:871 msgid "How can I have an easy-to-acces calendar ?" msgstr "Come posso avere un calendario di facile consultazione?" -#: ../data/messages:871 +#: ../data/messages:873 msgid "" "activate the “clock” applet; clicking on it will display a calendar, " "clicking again will hide it." @@ -2882,11 +2909,11 @@ "Attivate l'applet 'Orologio'; cliccando su esso apparirà un calendario," "cliccando nuovamente si nasconderà." -#: ../data/messages:873 +#: ../data/messages:875 msgid "How can I have the notification area (also called systray) ?" msgstr "Come posso avere l'area di notificazione (cosiddetta systray?)" -#: ../data/messages:875 +#: ../data/messages:877 msgid "" "activate the “systray” applet. For the moment it can’t be displayed directly " "into the dock,\n" @@ -2902,14 +2929,14 @@ "Raccomando di sganciare questa applet per renderla una desklet, posizionata " "in un angolo dello schermo, e lasciarla sotto le altre finestre." -#: ../data/messages:877 +#: ../data/messages:879 msgid "" "How can I have an easy-to-access terminal with real transparence, like " "Tilda ?" msgstr "" "Posso avere un terminale facilmente accessibile e trasparente, come Tilda ?" -#: ../data/messages:879 +#: ../data/messages:881 msgid "" "Hint : clicking next to the last tab will create a new tab. Double-clicking " "on a tab allows you to rename it. You can even change the color of a tab !" @@ -2918,7 +2945,7 @@ "Facendo doppio click su una tab, potrete rinominarla. Potrete anche cambiare " "il colore della tab !" -#: ../data/messages:881 +#: ../data/messages:883 msgid "" "activate the “terminal” applet. You can detach it and place it on the Widget " "Layer for instance, or setup a shorkey to make it pop-up instantly." @@ -2927,11 +2954,11 @@ "Livello di Widgets, per esempio, oppure impostare una shortcut per attivarlo " "istantaneamente." -#: ../data/messages:883 +#: ../data/messages:885 msgid "So then, how can I remove completely the gnome-panel ?" msgstr "Ma allora, come posso eliminare completamente lo gnome-panel ?" -#: ../data/messages:885 +#: ../data/messages:887 msgid "" "Open gconf-editor, edit the key /desktop/gnome/session/" "required_components_list, and erase its content (\"panel\").\n" @@ -2941,15 +2968,15 @@ "required_components_list, e cancellatene il contenuto (\"panel\").\n" "Riavviate la sessione: lo gnome-panel non partirà." -#: ../data/messages:887 +#: ../data/messages:889 msgid "Other applets" msgstr "Altre applet" -#: ../data/messages:889 +#: ../data/messages:891 msgid "How can I have a same applet many times ?" msgstr "Come posso avere lo stesso applet più volte ?" -#: ../data/messages:891 +#: ../data/messages:893 msgid "" "Hint : This allows you, for example, to have the time of different countries " "in your dock, or to have many animated caracters in your dock, or the " @@ -2959,7 +2986,7 @@ "nazioni sulla vostra barra, o di avere molti personaggi animati, o le " "previsioni del tempo di diverse città." -#: ../data/messages:893 +#: ../data/messages:895 msgid "" "Some applets can run several times at the same time : Clock, Cairo-Penguin, " "Weather, Netspeed, …\n" @@ -2973,7 +3000,7 @@ "nuova istanza dell'applet apparirà sulla barra principale.\n" "Potete configurarla allo stesso modo di tutte le altre." -#: ../data/messages:895 +#: ../data/messages:897 msgid "" "I have a personal gauge that I want to use in the dock (for cpusage or " "others)" @@ -2981,7 +3008,7 @@ "Ho un misuratore particolare che voglio usare nella barra (e.g. per " "l'utilizzo della CPU)." -#: ../data/messages:897 +#: ../data/messages:899 msgid "" "move the folder containing your gauge in ~/.config/cairo-dock/extras/gauges, " "you’re done !" @@ -2989,12 +3016,12 @@ "Spostate la cartella contenente il misuratore in ~/.config/cairo-dock/extras/" "gauges, ed è fatta !" -#: ../data/messages:899 +#: ../data/messages:901 msgid "" "I have a personal Cairo-Clock theme that I want to use in the “clock” applet." msgstr "Ho un tema di Cairo-Clock che voglio usare nell'applet 'Clock'." -#: ../data/messages:901 +#: ../data/messages:903 msgid "" "Hint : the same goes on for all the applets that propose a theme : dustbin, " "Cairo-Penguin, weather, etc." @@ -3002,7 +3029,7 @@ "Suggerimento : lo stesso vale per tutte le altre applet che propongono un " "tema" -#: ../data/messages:903 +#: ../data/messages:905 msgid "" "move the folder containing your theme in ~/.config/cairo-dock/extras/clock, " "you’re done !" @@ -3010,35 +3037,41 @@ "Spostate la cartella contenente il tema in ~/.config/cairo-dock/extras/" "clock, ed è fatta !" -#: ../data/messages:905 +#: ../data/messages:907 msgid "How can I change quickly the luminosity of my screen ?" msgstr "" -#: ../data/messages:907 +#: ../data/messages:909 msgid "" "Activate the Xgamma applet, then you can scroll up/down on the icon with the " "mouse." msgstr "" -#: ../data/messages:909 +#: ../data/messages:911 msgid "How can I change quickly the speakers volume ?" msgstr "" -#: ../data/messages:911 +#: ../data/messages:913 msgid "" "Activate the AlsaMixer applet, then you can scroll up/down on the icon with " "the mouse." msgstr "" -#: ../data/messages:913 +#: ../data/messages:915 msgid "Troubleshooting" msgstr "Troubleshooting" -#: ../data/messages:915 +#: ../data/messages:917 msgid "I have a black background around my dock" msgstr "Ho uno sfondo nero attorno alla mia barra" -#: ../data/messages:917 +#: ../data/messages:919 +msgid "" +"Hint : If yo have an ATI or an Intel, you should try without OpenGL first, " +"because their drivers are not yet perfect." +msgstr "" + +#: ../data/messages:921 msgid "" "You have to turn on the compositing. For instance, you can run Compiz or " "xcompmgr. \n" @@ -3049,11 +3082,11 @@ "xcompmgr\n" ".Sotto XFCE o KDE, vi basta attivarlo tra le opzioni del window manager." -#: ../data/messages:919 +#: ../data/messages:923 msgid "My machine is too old to run a composite manager" msgstr "La mia macchina è troppo vecchia per avviare un composite manager." -#: ../data/messages:921 +#: ../data/messages:925 msgid "" "Don’t panic, Cairo-Dock can emulate the transparency.\n" "So to get rid of the black background, just activate the corresponding " @@ -3062,15 +3095,11 @@ "Niente panico, Cairo-dock può simulare l'effetto trasparenza.\n" "Basta attivare l'opzione corrispondente, alla fine del modulo 'Sistema'." -#: ../data/messages:923 +#: ../data/messages:927 msgid "The dock is horribly slow when I move the mouse into it" msgstr "La barra è terribilmente lenta quando vi muovo sopra il mouse." -#: ../data/messages:925 -msgid "Hint : " -msgstr "Suggerimento : " - -#: ../data/messages:927 +#: ../data/messages:929 msgid "" "If you have a GeForce8, you have to install the latest drivers, because the " "first ones were really buggy.\n" @@ -3086,11 +3115,11 @@ "Se la barra va con OpenGL, provate a disattivarlo lanciandola con 'cairo-" "dock -c'." -#: ../data/messages:929 +#: ../data/messages:931 msgid "I don’t have these wonderful effects like fire, cube rotating, etc" msgstr "Non ho questi magnifici effetti come il fuoco, il cubo, etc" -#: ../data/messages:931 +#: ../data/messages:933 msgid "" "Hint : You can force the openGL by launching the dock with “cairo-dock –o”." "but you might get a lot of visual artifacts." @@ -3098,7 +3127,7 @@ "Suggerimento : potete forzare OpenGL lanciado la barra con 'cairo-dock --o'-" "Ma potreste perdere molti effetti visivi." -#: ../data/messages:933 +#: ../data/messages:935 msgid "" "You need a graphic card with drivers that support openGL2.0. Most of Nvidia " "cards can do that, more and more Intel cards can do too. Most of ATI cards " @@ -3108,11 +3137,11 @@ "parte delle schede Nvidia lo fanno, sempre più schede Intel ne sono in " "grado. La maggior parte delle schede ATI non è in grado." -#: ../data/messages:935 +#: ../data/messages:937 msgid "The “netspeed” applet displays 0 even when I’m downloading something" msgstr "L'applet 'netspeed' mostra 0 anche mentre scarico qualcosa." -#: ../data/messages:937 +#: ../data/messages:939 msgid "" "Hint : you can instantiate this applet many times if you want to monitor " "many interfaces." @@ -3120,7 +3149,7 @@ "Suggerimento : potete istanziare questa applet più volte se volete " "monitorare più interfacce." -#: ../data/messages:939 +#: ../data/messages:941 msgid "" "You have to tell it which interface you’re using to connect to the Net (by " "default, it’s “eth0”).\n" @@ -3134,11 +3163,11 @@ "conoscerla, digitate 'ifconfig' al terminale, e ignorate l'interfaccia " "'loop'. Probabilmente è qualcosa come 'eth1', 'ath0', or 'wifi0'." -#: ../data/messages:941 +#: ../data/messages:943 msgid "The dustbin remains empty even when I delete a file" msgstr "Il cestino rimane vuoto anche se cancello un file." -#: ../data/messages:943 +#: ../data/messages:945 msgid "" "if you’re under KDE, you may have to tell it the path of the trash folder.\n" "Just edit the applet’s configuration, and fill in the Trash path; it is " @@ -3150,11 +3179,11 @@ "probabilmente ~/.locale/share/Trash/files. State molto attenti quando " "digitate un percorso qui !!!Non inserite spazi nè caratteri invisibili." -#: ../data/messages:945 +#: ../data/messages:947 msgid "Help us !" msgstr "Aiutateci !" -#: ../data/messages:947 +#: ../data/messages:949 msgid "" "We value your help ! If you see a bug, or if you think something could be " "improved,\n" @@ -3178,11 +3207,11 @@ # ################################# # ########### launcher.conf ############# # ################################# -#: ../data/messages:951 +#: ../data/messages:953 msgid "Launcher's name :" msgstr "Nome del lanciatore :" -#: ../data/messages:953 +#: ../data/messages:955 msgid "" "Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard " "shortcut, for exemple F1 for the Applications Menu, c or v " @@ -3192,11 +3221,11 @@ "scorciatoia da tastiera, per esempio F1 per il menu delle Applicazioni, " "C o V per copiare, incollare, etc..." -#: ../data/messages:955 +#: ../data/messages:957 msgid "Command to launch on click :" msgstr "Commando da eseguire al click :" -#: ../data/messages:959 +#: ../data/messages:961 msgid "" "If you write here a container's name that doesn't exist yet, a new one will " "be created, with this icon inside." @@ -3204,7 +3233,7 @@ "Se si scrive qui il nome di un contenitore ancora non esistente, ne sarà " "creato uno nuovo, con quest'icona all'interno." -#: ../data/messages:967 +#: ../data/messages:969 msgid "" "If you choosed to mix launcher and applis, this option will deactivate this " "behaviour for this launcher only. It can be useful for instance for a " @@ -3212,11 +3241,11 @@ "steal the Terminal's icon from the Taskbar." msgstr "" -#: ../data/messages:969 +#: ../data/messages:971 msgid "Prevent this launcher from stealing appli from taskbar ?" msgstr "Impedire a questo lanciatore di rubare l'applicazione nella TaskBar ?" -#: ../data/messages:971 +#: ../data/messages:973 msgid "" "The only reason you may want to modify this parameter is if you made this " "launcher by hands. If you dropped it into the dock from the menu, it is " @@ -3228,15 +3257,19 @@ "dal menu, è quasi certo che non serva metterci mano. Definisce la classe del " "programma, ciò che risulta utile per legare l'applicazione al suo lanciatore." -#: ../data/messages:973 +#: ../data/messages:975 msgid "Class of the program :" msgstr "Classe del programma :" -#: ../data/messages:975 +#: ../data/messages:977 +msgid "It will use 'xterm'." +msgstr "" + +#: ../data/messages:979 msgid "Run in a terminal ?" msgstr "" -#: ../data/messages:983 +#: ../data/messages:987 #, fuzzy msgid "" "Choose the screen border regarding to which the dock will place itself :" @@ -3244,7 +3277,7 @@ "Scegliere il bordo dello schermo in rapporto al quale la barra verrà " "piazzata:" -#: ../data/messages:1007 +#: ../data/messages:1011 msgid "" "The dock will automatically hide itself outside of the scren when the mouse " "leaves it and will show a callback zone instead. Place the mouse into this " @@ -3257,27 +3290,27 @@ # ################################# # ########### themes.conf ############# # ################################# -#: ../data/messages:1021 +#: ../data/messages:1025 msgid "Themes" msgstr "Temi" -#: ../data/messages:1023 +#: ../data/messages:1027 msgid "Choose a theme" msgstr "Scegliere un tema" -#: ../data/messages:1025 +#: ../data/messages:1029 msgid "Choose one of the available themes :" msgstr "" -#: ../data/messages:1027 +#: ../data/messages:1031 msgid "You can even drop an internet URL." msgstr "" -#: ../data/messages:1029 +#: ../data/messages:1033 msgid "... or drag and drop a theme package here :" msgstr "" -#: ../data/messages:1031 +#: ../data/messages:1035 msgid "" "So if you check this box, your launchers will be deleted and replaced by the " "ones provided in the new theme. Otherwise the current launchers will be " @@ -3287,11 +3320,11 @@ "e rimpiazzati da quelli forniti dal nuovo tema. Altrimenti i lanciatori " "attuali saranno mantenuti e cambieranno solo le icone." -#: ../data/messages:1033 +#: ../data/messages:1037 msgid "Use the new theme's launchers ?" msgstr "Utilizzare i lanciatori del nuovo tema ?" -#: ../data/messages:1035 +#: ../data/messages:1039 msgid "" "Otherwise the current behaviour will be kept. It's all about the dock's " "position, behaviour parameters such as auto-hide, using taskbar or not, etc." @@ -3300,62 +3333,62 @@ "riguarda la posizione della barra, i parametri di comportamento come l'auto-" "nascondimento, l'utilizzo della TaskBar o meno, etc..." -#: ../data/messages:1037 +#: ../data/messages:1041 msgid "Use the new theme's behaviour ?" msgstr "Utilizzare il comportamento del nuovo tema ?" -#: ../data/messages:1039 +#: ../data/messages:1043 msgid "Save" msgstr "Salva" -#: ../data/messages:1041 +#: ../data/messages:1045 msgid "Save current theme" msgstr "Salva il tema attuale" -#: ../data/messages:1043 +#: ../data/messages:1047 msgid "You will then be able to re-open it at any time." msgstr "Si potrà riaprire ad ogni momento." -#: ../data/messages:1045 +#: ../data/messages:1049 msgid "Save as :" msgstr "Salva come :" -#: ../data/messages:1047 +#: ../data/messages:1051 msgid "Save current behaviour too ?" msgstr "Salvare anche il comportamento attuale ?" -#: ../data/messages:1049 +#: ../data/messages:1053 msgid "Save current launchers too ?" msgstr "Salvare anche i lanciatori attuali ?" -#: ../data/messages:1051 +#: ../data/messages:1055 msgid "" "The dock will build a complete tarball of your current theme, allowing you " "to exchange it easily with other people." msgstr "" -#: ../data/messages:1053 +#: ../data/messages:1057 msgid "Build a package of the theme ?" msgstr "" -#: ../data/messages:1055 +#: ../data/messages:1059 msgid "Delete" msgstr "Elimina" -#: ../data/messages:1057 +#: ../data/messages:1061 msgid "List of your personnal themes" msgstr "Lista dei temi personali" -#: ../data/messages:1059 +#: ../data/messages:1063 msgid "Delete from the list themes you don't want anymore :" msgstr "Cancellare dalla lista i temi che non volete più :" -#: ../data/messages:1061 +#: ../data/messages:1065 msgid "pouet" msgstr "puzza" -#: ../data/messages:1063 ../data/messages:1065 ../data/messages:1067 -#: ../data/messages:1069 +#: ../data/messages:1067 ../data/messages:1069 ../data/messages:1071 +#: ../data/messages:1073 msgid "" "v1.4.6.3 :\n" "Just to say :\n" @@ -3370,7 +3403,7 @@ # ################################# # ########### ChangeLog ############# # ################################# -#: ../data/messages:1071 +#: ../data/messages:1075 msgid "" "v1.5.0 : it's been 1 month since previous release, and we worked hardly to " "bring you :\n" @@ -3390,7 +3423,7 @@ " Now, why not try to make an applet for Cairo-Dock ? ;-)" msgstr "" -#: ../data/messages:1073 +#: ../data/messages:1077 msgid "" "v1.5.1 :\n" " - The 1.5 branch is still young, so this version brings a lot of bug fixes\n" @@ -3402,7 +3435,7 @@ " and behave as real desklets." msgstr "" -#: ../data/messages:1075 +#: ../data/messages:1079 msgid "" "v1.5.2.1 :\n" " - a lot of bug fixes, especially on desklets.\n" @@ -3410,7 +3443,7 @@ " - Cairo-Dock is now fully translated in Japanese, thanks to Jiro Kawada !" msgstr "" -#: ../data/messages:1077 +#: ../data/messages:1081 msgid "" "v1.5.3.2 :\n" " - Themes have been deeply reviewed\n" @@ -3424,7 +3457,7 @@ " who could help cairo-dock to be well-integrated into KDE ;-)" msgstr "" -#: ../data/messages:1079 +#: ../data/messages:1083 msgid "" "v1.5.4.2 : a huge release !\n" " - add a cute pinguin in your dock with the new applet Cairo-Penguin\n" @@ -3438,7 +3471,7 @@ " - 3 more themes in Weather" msgstr "" -#: ../data/messages:1081 +#: ../data/messages:1085 msgid "" "v1.5.5.4 :\n" " - Huge enhancements in the TaskBar :\n" @@ -3454,7 +3487,7 @@ "soon ;-)" msgstr "" -#: ../data/messages:1083 +#: ../data/messages:1087 msgid "" "v1.5.6 :\n" " - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still " @@ -3472,7 +3505,7 @@ " - Any help would be welcome to integrate the dock into KDE !" msgstr "" -#: ../data/messages:1085 +#: ../data/messages:1089 msgid "" "v1.6.0 :\n" " - A new view has appeared : Diapositive !\n" @@ -3491,7 +3524,7 @@ " - Real window thumbnail when minimized." msgstr "" -#: ../data/messages:1087 +#: ../data/messages:1091 msgid "" "v1.6.1 :\n" "Cairo-Dock has one year ! To celebrate this event, we are happy to offer " @@ -3504,7 +3537,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1089 +#: ../data/messages:1093 msgid "" "v1.6.2 : the first version integrated in the Ubuntu repositories !\n" " - 2 new applets have been released :\n" @@ -3517,7 +3550,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1091 +#: ../data/messages:1095 msgid "" "v1.6.3 : \n" " - first the bad news :\n" @@ -3535,7 +3568,7 @@ " - The dock is now translated in Sweden and partially in Greek." msgstr "" -#: ../data/messages:1093 +#: ../data/messages:1097 msgid "" "Cairo-Dock II\n" " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " @@ -3548,20 +3581,47 @@ " - Lot of bug fixes and upgrades in all plug-ins." msgstr "" -#: ../data/messages:1095 +#: ../data/messages:1099 msgid "" -"Cairo-Dock II\n" -" - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " -"available for old graphic cards or ATI)\n" -" - New plug-ins provide many visual affects : Animated icons, icon effects, " -"illusion, drop indicator, motion blur, dialog rendering\n" -" - The config panel has been widely rewritten.\n" -" - Desklets are now in 3D\n" -" - New applets : mail, keyboard indicator, quick folder, Toons.\n" -" - Lot of bug fixes and upgrades in all plug-ins.\n" -" - 2.0.3 : some bug fixes + improvment of the config panel." +"2.0.5 :\n" +" - This is mainly a bug-fix version\n" +" - improvment in the RB applet\n" +" - Added functionnalities on grouped applications icons." msgstr "" +#~ msgid "< Safe Mode >" +#~ msgstr "< Modalità di sicurezza >" + +#~ msgid "" +#~ "You are running Cairo-Dock in safe mode.\n" +#~ "Why ? Probably because a plug-in has messed into your dock,\n" +#~ " or maybe your theme has got corrupted.\n" +#~ "So, no plug-in will be available, and you can now save your current theme " +#~ "if you want\n" +#~ " before you start using the dock.\n" +#~ "Try with your current theme, if it works, it means a plug-in is wrong.\n" +#~ "Otherwise, try with another theme.\n" +#~ "Save a config that is working, and restart the dock in normal mode.\n" +#~ "Then, activate plug-ins one by one to guess which one is wrong." +#~ msgstr "" +#~ "State eseguendo Cairo-dock in modalità di sicurezza.\n" +#~ "Perché ? Probabilmente a causa di un plug-in che crea problemi alla " +#~ "barra,\n" +#~ " o può essere che il vostro tema sia corrotto.\n" +#~ "Perciò nessun plug-in sarà disponibile, e voi potete salvare il vostro " +#~ "tema corrente se lo volete,\n" +#~ " prima di utilizzare la barra.\n" +#~ "Poi provate col vostro tema e se funziona significa che è un plug-in che " +#~ "causa conflitti.\n" +#~ "Altrimenti utilizzate un altro tema.\n" +#~ "Salvate una configurazine della barra funzionante, e rilanciate la barra " +#~ "in modo normale.\n" +#~ "Successivamente attivate uno ad uno i plug-in per capire quale crea " +#~ "problemi." + +#~ msgid "Hint : " +#~ msgstr "Suggerimento : " + #~ msgid "Should the applications with same PID be displayed only once ?" #~ msgstr "Mostrare le applicazioni con lo stesso PID una sola volta ?" diff -Nru cairo-dock-2.0.3/po/ja.po cairo-dock-2.0.5/po/ja.po --- cairo-dock-2.0.3/po/ja.po 2009-05-23 02:54:58.000000000 +0200 +++ cairo-dock-2.0.5/po/ja.po 2009-06-10 02:31:42.000000000 +0200 @@ -7,21 +7,17 @@ msgstr "" "Project-Id-Version: 1.4.5\n" "Report-Msgid-Bugs-To: fabounet@users.berlios.de\n" -"PO-Revision-Date: 2009-04-01 19:22+0900\n" +"PO-Revision-Date: 2009-06-04 18:03+0900\n" "Last-Translator: jiro kawada \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/cairo-dock-callbacks.c:1184 +#: ../src/cairo-dock-callbacks.c:1181 msgid "Do you want to mount this point ?" msgstr "このポイントにマウントしますか？" -#: ../src/cairo-dock-callbacks.c:1773 -msgid "Quit Cairo-Dock ?" -msgstr "Cairo-Dock 終了？" - #: ../src/cairo-dock-desktop-file-factory.c:158 msgid "Do you want to monitor the content of the directory ?" msgstr "このディレクトリの内容をモニターしますか？" @@ -83,7 +79,7 @@ "機能を利用するには、ドック本体と同じバージョンのプラグインをインストールして" "下さい。" -#: ../src/cairo-dock-gui-factory.c:715 +#: ../src/cairo-dock-gui-factory.c:722 #, c-format msgid "" "The '%s' plug-in is not active.\n" @@ -92,75 +88,75 @@ "'%s' プラグインが有効化されていません。\n" "機能を利用するには、プラグインを有効にして下さい。" -#: ../src/cairo-dock-gui-factory.c:1710 +#: ../src/cairo-dock-gui-factory.c:1719 msgid "grab" msgstr "取得" -#: ../src/cairo-dock-gui-manager.c:72 ../data/messages:89 +#: ../src/cairo-dock-gui-manager.c:73 ../data/messages:89 msgid "Behaviour" msgstr "挙動" -#: ../src/cairo-dock-gui-manager.c:73 +#: ../src/cairo-dock-gui-manager.c:74 msgid "Appearance" msgstr "外観" -#: ../src/cairo-dock-gui-manager.c:74 +#: ../src/cairo-dock-gui-manager.c:75 msgid "Accessories" msgstr "アクセサリ" -#: ../src/cairo-dock-gui-manager.c:75 +#: ../src/cairo-dock-gui-manager.c:76 msgid "Desktop" msgstr "デスクトップ" -#: ../src/cairo-dock-gui-manager.c:76 +#: ../src/cairo-dock-gui-manager.c:77 msgid "Controlers" msgstr "コントローラ" -#: ../src/cairo-dock-gui-manager.c:77 +#: ../src/cairo-dock-gui-manager.c:78 msgid "Plug-ins" msgstr "プラグイン" -#: ../src/cairo-dock-gui-manager.c:406 +#: ../src/cairo-dock-gui-manager.c:407 msgid "Categories" msgstr "カテゴリ" -#: ../src/cairo-dock-gui-manager.c:427 +#: ../src/cairo-dock-gui-manager.c:428 msgid "All" msgstr "すべて" -#: ../src/cairo-dock-gui-manager.c:533 +#: ../src/cairo-dock-gui-manager.c:534 msgid "Activate this module" msgstr "このモジュールを有効化" -#: ../src/cairo-dock-gui-manager.c:551 +#: ../src/cairo-dock-gui-manager.c:552 msgid "Filter" msgstr "フィルタ" -#: ../src/cairo-dock-gui-manager.c:591 +#: ../src/cairo-dock-gui-manager.c:592 msgid "All words" msgstr "アンド検索" -#: ../src/cairo-dock-gui-manager.c:598 +#: ../src/cairo-dock-gui-manager.c:599 msgid "Highlight words" msgstr "該当ワードを強調表示" -#: ../src/cairo-dock-gui-manager.c:606 +#: ../src/cairo-dock-gui-manager.c:607 msgid "Hide others" msgstr "該当外を隠す" -#: ../src/cairo-dock-gui-manager.c:614 +#: ../src/cairo-dock-gui-manager.c:615 msgid "Search in description" msgstr "ツールチップも検索" -#: ../src/cairo-dock-gui-manager.c:677 +#: ../src/cairo-dock-gui-manager.c:686 msgid "< Maintenance mode >" msgstr "< メンテナンスモード >" -#: ../src/cairo-dock-gui-manager.c:695 ../src/cairo-dock-gui-manager.c:766 +#: ../src/cairo-dock-gui-manager.c:704 ../src/cairo-dock-gui-manager.c:775 msgid "Configuration of Cairo-Dock" msgstr "Cairo-Dock の設定" -#: ../src/cairo-dock-gui-manager.c:1004 +#: ../src/cairo-dock-gui-manager.c:1013 #, c-format msgid "" "The module '%s' is not present. You need to install it or its dependencies " @@ -169,23 +165,23 @@ "'%s' モジュールが存在しません。モジュールまたはその依存関係をインストールする" "必要があります。" -#: ../src/cairo-dock-gui-manager.c:1010 +#: ../src/cairo-dock-gui-manager.c:1019 #, c-format msgid "The module '%s' is not activated." msgstr "'%s' モジュールが有効になっていません。" -#: ../src/cairo-dock-gui-manager.c:1011 +#: ../src/cairo-dock-gui-manager.c:1020 msgid "Do you want to activate it now ?" msgstr "直ちに有効にしますか？" #: ../src/cairo-dock-internal-accessibility.c:170 -#: ../src/cairo-dock-menu.c:1409 ../data/messages:39 +#: ../src/cairo-dock-menu.c:1562 ../data/messages:39 msgid "Accessibility" msgstr "アクセシビリティ" #: ../src/cairo-dock-internal-accessibility.c:172 msgid "How do you access to your docks ?" -msgstr "ドックへのアクセス方法" +msgstr "ドックへのアクセス方法の設定" #: ../src/cairo-dock-internal-background.c:93 ../data/messages:269 msgid "Background" @@ -193,7 +189,7 @@ #: ../src/cairo-dock-internal-background.c:95 msgid "Set a background to your dock." -msgstr "ドックに背景をセットします。" +msgstr "ドックの背景の設定" #: ../src/cairo-dock-internal-desklets.c:89 ../data/messages:509 msgid "Desklets" @@ -201,7 +197,7 @@ #: ../src/cairo-dock-internal-desklets.c:91 msgid "The applets can be set on your desktop as widgets." -msgstr "アプレットをウィジェットとしてデスクトップに配置可能" +msgstr "アプレットはウィジェットとしてデスクトップに配置可能" #: ../src/cairo-dock-internal-dialogs.c:91 msgid "" @@ -217,10 +213,9 @@ #: ../src/cairo-dock-internal-dialogs.c:95 msgid "Configure the look of the dialog bubbles." -msgstr "ダイアログ吹き出しの外観に関わる設定" +msgstr "吹き出し状のダイアログの外観に関わる設定" #: ../src/cairo-dock-internal-hidden-dock.c:74 -#, fuzzy msgid "Hidden Dock" msgstr "隠れ状態のドック" @@ -228,20 +223,22 @@ msgid "Define the appearance of the dock when it's hidden." msgstr "ドックが隠れた状態のときの外観の定義" -#: ../src/cairo-dock-internal-icons.c:337 +#: ../src/cairo-dock-internal-icons.c:348 msgid "It provides many animations to your icons." msgstr "これは、様々なアニメーションをアイコンに提供しています。" -#: ../src/cairo-dock-internal-icons.c:339 ../data/messages:355 +#: ../src/cairo-dock-internal-icons.c:350 ../data/messages:355 #: ../data/messages:665 msgid "Icons" msgstr "アイコン" -#: ../src/cairo-dock-internal-icons.c:341 +#: ../src/cairo-dock-internal-icons.c:352 msgid "" "All about icons :\n" " size, reflection, icon theme, ..." msgstr "" +"アイコンに関する設定 :\n" +"大きさ、反射、アイコンのテーマ ..." #: ../src/cairo-dock-internal-indicators.c:129 ../data/messages:557 msgid "Indicators" @@ -262,12 +259,12 @@ # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-internal-position.c:95 ../data/messages:1 -#: ../data/messages:977 +#: ../src/cairo-dock-internal-position.c:96 ../data/messages:1 +#: ../data/messages:981 msgid "Position" msgstr "配置位置" -#: ../src/cairo-dock-internal-position.c:97 +#: ../src/cairo-dock-internal-position.c:98 msgid "Set the position of the main dock." msgstr "メイン・ドックの配置位置の設定" @@ -285,7 +282,7 @@ #: ../src/cairo-dock-internal-taskbar.c:181 msgid "Display and interact with the currently open windows." -msgstr "" +msgstr "現在開いているウィンドウの表示や操作" #: ../src/cairo-dock-internal-views.c:76 msgid "" @@ -303,19 +300,23 @@ msgid "Select a view for each of your docks." msgstr "各ドックに適用するビュー形式の選択" -#: ../src/cairo-dock-menu.c:142 +#: ../src/cairo-dock-menu.c:139 msgid "Development" msgstr "開発" -#: ../src/cairo-dock-menu.c:148 +#: ../src/cairo-dock-menu.c:145 msgid "Artwork" msgstr "アートワーク" -#: ../src/cairo-dock-menu.c:152 +#: ../src/cairo-dock-menu.c:149 msgid "Support" msgstr "サポート" -#: ../src/cairo-dock-menu.c:237 +#: ../src/cairo-dock-menu.c:231 +msgid "Quit Cairo-Dock ?" +msgstr "Cairo-Dock 終了？" + +#: ../src/cairo-dock-menu.c:246 msgid "" "Do you want to re-dispatch the icons contained inside this container into " "the dock ?\n" @@ -324,24 +325,24 @@ "このコンテナ内にあるアイコンをドックに戻しますか？\n" "（戻さない場合、アイコンは削除されます。）" -#: ../src/cairo-dock-menu.c:258 +#: ../src/cairo-dock-menu.c:267 #, c-format msgid "You're about removing this icon (%s) from the dock. Sure ?" msgstr "ドックからこのアイコン(%s)を削除しようとしています。よろしいですか？" -#: ../src/cairo-dock-menu.c:314 +#: ../src/cairo-dock-menu.c:323 msgid "Fill this launcher" msgstr "このランチャー設定項目を入力" -#: ../src/cairo-dock-menu.c:326 +#: ../src/cairo-dock-menu.c:335 msgid "Undefined" msgstr "未定義" -#: ../src/cairo-dock-menu.c:478 ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:487 ../src/cairo-dock-menu.c:1448 msgid "Modify this launcher" msgstr "このランチャーを編集" -#: ../src/cairo-dock-menu.c:620 +#: ../src/cairo-dock-menu.c:629 #, c-format msgid "" "You're about deleting this file\n" @@ -352,7 +353,7 @@ "をハードディスクから削除しようとしています。\n" "本当に削除しますか？" -#: ../src/cairo-dock-menu.c:629 +#: ../src/cairo-dock-menu.c:638 msgid "" "Attention : couldn't delete this file.\n" "Check that you have writing rights on it." @@ -360,11 +361,11 @@ "注意 : このファイルを削除できませんでした。\n" "ファイルに対する書き込み権限の有るかチェックしてください。" -#: ../src/cairo-dock-menu.c:653 +#: ../src/cairo-dock-menu.c:662 msgid "Rename to :" msgstr "新しい名前 :" -#: ../src/cairo-dock-menu.c:660 +#: ../src/cairo-dock-menu.c:669 #, c-format msgid "" "Attention : couldn't rename %s.\n" @@ -375,250 +376,282 @@ "書き込み権限が有るか、指定した新しい名前が\n" "すでに存在していないかどうかチェックしてください。" -#: ../src/cairo-dock-menu.c:705 +#: ../src/cairo-dock-menu.c:714 #, c-format msgid "You're about removing this applet (%s) from the dock. Sure ?" msgstr "このモジュール(%s)をドックから削除しようとしています。よろしいですか？" -#: ../src/cairo-dock-menu.c:1034 +#: ../src/cairo-dock-menu.c:840 +msgid "" +"Sorry, couldn't find the corresponding description file.\n" +"Consider drag and dropping the launcher from the Applications Menu." +msgstr "" + +#: ../src/cairo-dock-menu.c:1166 #, c-format msgid "Set position for the dock '%s'" msgstr "ドック '%s' の配置位置の設定" -#: ../src/cairo-dock-menu.c:1117 +#: ../src/cairo-dock-menu.c:1249 msgid "Configure" msgstr "設定" -#: ../src/cairo-dock-menu.c:1124 +#: ../src/cairo-dock-menu.c:1256 msgid "Set up this dock" msgstr "このドックの設定" -#: ../src/cairo-dock-menu.c:1126 +#: ../src/cairo-dock-menu.c:1258 msgid "Manage themes" msgstr "テーマ管理" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "unlock icons" msgstr "アイコン固定解除" -#: ../src/cairo-dock-menu.c:1129 +#: ../src/cairo-dock-menu.c:1261 msgid "lock icons" msgstr "アイコン固定" -#: ../src/cairo-dock-menu.c:1139 +#: ../src/cairo-dock-menu.c:1271 msgid "Quick-Hide" msgstr "一時的に隠す" -#: ../src/cairo-dock-menu.c:1147 +#: ../src/cairo-dock-menu.c:1279 msgid "Launch Cairo-Dock on startup" msgstr "Cairo-Dock 自動起動" -#: ../src/cairo-dock-menu.c:1153 +#: ../src/cairo-dock-menu.c:1285 msgid "Development's site" msgstr "開発向けサイト" -#: ../src/cairo-dock-menu.c:1155 +#: ../src/cairo-dock-menu.c:1287 msgid "Community's site" msgstr "コミュニティサイト" -#: ../src/cairo-dock-menu.c:1157 +#: ../src/cairo-dock-menu.c:1289 msgid "Help" msgstr "ヘルプ" -#: ../src/cairo-dock-menu.c:1159 +#: ../src/cairo-dock-menu.c:1291 msgid "About" msgstr "情報" -#: ../src/cairo-dock-menu.c:1163 +#: ../src/cairo-dock-menu.c:1295 msgid "Quit" msgstr "終了" -#: ../src/cairo-dock-menu.c:1191 ../src/cairo-dock-menu.c:1253 +#: ../src/cairo-dock-menu.c:1315 +#, fuzzy, c-format +msgid "Move all to desktop %d - face %d" +msgstr "デスクトップ %d - 面 %d へ移動" + +#: ../src/cairo-dock-menu.c:1315 +#, c-format +msgid "Move to desktop %d - face %d" +msgstr "デスクトップ %d - 面 %d へ移動" + +#: ../src/cairo-dock-menu.c:1317 +#, fuzzy, c-format +msgid "Move all to desktop %d" +msgstr "デスクトップ %d へ移動" + +#: ../src/cairo-dock-menu.c:1317 +#, c-format +msgid "Move to desktop %d" +msgstr "デスクトップ %d へ移動" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Move all to face %d" +msgstr "面 %d へ移動" + +#: ../src/cairo-dock-menu.c:1319 +#, fuzzy, c-format +msgid "Moveto face %d" +msgstr "面 %d へ移動" + +#: ../src/cairo-dock-menu.c:1368 ../src/cairo-dock-menu.c:1430 msgid "Add a manual launcher" msgstr "手製ランチャーを追加" -#: ../src/cairo-dock-menu.c:1192 ../src/cairo-dock-menu.c:1254 +#: ../src/cairo-dock-menu.c:1369 ../src/cairo-dock-menu.c:1431 msgid "" "Don't forget you can drag a launcher from the menu and drop it in the dock !" msgstr "" "メニューから既存のランチャーをドラッグして、ドックにドロップできることもお忘" "れなく！" -#: ../src/cairo-dock-menu.c:1194 ../src/cairo-dock-menu.c:1256 +#: ../src/cairo-dock-menu.c:1371 ../src/cairo-dock-menu.c:1433 msgid "Add a sub-dock" msgstr "サブ・ドックを追加" -#: ../src/cairo-dock-menu.c:1198 ../src/cairo-dock-menu.c:1260 +#: ../src/cairo-dock-menu.c:1375 ../src/cairo-dock-menu.c:1437 msgid "Add a separator" msgstr "区切りを追加" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Unmount" msgstr "アンマウント" -#: ../src/cairo-dock-menu.c:1218 +#: ../src/cairo-dock-menu.c:1395 msgid "Mount" msgstr "マウント" -#: ../src/cairo-dock-menu.c:1224 +#: ../src/cairo-dock-menu.c:1401 msgid "Eject" msgstr "イジェクト" -#: ../src/cairo-dock-menu.c:1231 +#: ../src/cairo-dock-menu.c:1408 msgid "Delete this file" msgstr "このファイルを削除" -#: ../src/cairo-dock-menu.c:1235 +#: ../src/cairo-dock-menu.c:1412 msgid "Rename this file" msgstr "このファイルをリネーム" -#: ../src/cairo-dock-menu.c:1239 +#: ../src/cairo-dock-menu.c:1416 msgid "Properties" msgstr "プロパティ" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this separator" msgstr "この区切りを削除" -#: ../src/cairo-dock-menu.c:1269 +#: ../src/cairo-dock-menu.c:1446 msgid "Remove this launcher" msgstr "このランチャーを削除" -#: ../src/cairo-dock-menu.c:1271 +#: ../src/cairo-dock-menu.c:1448 msgid "Modify this separator" msgstr "この区切りを編集" -#: ../src/cairo-dock-menu.c:1281 +#: ../src/cairo-dock-menu.c:1459 ../src/cairo-dock-menu.c:1503 msgid "Other actions" msgstr "その他のアクション" -#: ../src/cairo-dock-menu.c:1286 +#: ../src/cairo-dock-menu.c:1464 msgid "Move to this desktop" msgstr "このデスクトップに移動" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Not Fullscreen" msgstr "全画面表示解除" -#: ../src/cairo-dock-menu.c:1289 +#: ../src/cairo-dock-menu.c:1467 msgid "Fullscreen" msgstr "全画面表示" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Don't keep above" msgstr "最前面表示解除" -#: ../src/cairo-dock-menu.c:1293 +#: ../src/cairo-dock-menu.c:1471 msgid "Keep above" msgstr "最前面に表示" -#: ../src/cairo-dock-menu.c:1300 -#, c-format -msgid "Move to desktop %d - face %d" -msgstr "デスクトップ %d - 面 %d へ移動" - -#: ../src/cairo-dock-menu.c:1302 -#, c-format -msgid "Move to desktop %d" -msgstr "デスクトップ %d へ移動" - -#: ../src/cairo-dock-menu.c:1304 -#, c-format -msgid "Move to face %d" -msgstr "面 %d へ移動" - -#: ../src/cairo-dock-menu.c:1335 +#: ../src/cairo-dock-menu.c:1475 msgid "Kill" msgstr "強制終了" -#: ../src/cairo-dock-menu.c:1341 ../src/cairo-dock-menu.c:1365 +#: ../src/cairo-dock-menu.c:1480 ../src/cairo-dock-menu.c:1514 msgid "Launch new" msgstr "追加起動" -#: ../src/cairo-dock-menu.c:1346 -#, fuzzy +#: ../src/cairo-dock-menu.c:1485 msgid "Make it a launcher" -msgstr "このランチャーを編集" +msgstr "ランチャーに追加" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Unmaximize" msgstr "最大化解除" -#: ../src/cairo-dock-menu.c:1350 +#: ../src/cairo-dock-menu.c:1489 msgid "Maximize" msgstr "最大化" -#: ../src/cairo-dock-menu.c:1352 +#: ../src/cairo-dock-menu.c:1491 msgid "Show" msgstr "表示" -#: ../src/cairo-dock-menu.c:1354 +#: ../src/cairo-dock-menu.c:1493 msgid "Minimize" msgstr "最小化" -#: ../src/cairo-dock-menu.c:1356 +#: ../src/cairo-dock-menu.c:1495 msgid "Close" msgstr "閉じる" -#: ../src/cairo-dock-menu.c:1368 +#: ../src/cairo-dock-menu.c:1508 #, fuzzy +msgid "Move all to this desktop" +msgstr "このデスクトップに移動" + +#: ../src/cairo-dock-menu.c:1517 +#, fuzzy +msgid "Show all" +msgstr "表示" + +#: ../src/cairo-dock-menu.c:1519 +#, fuzzy +msgid "Minimize all" +msgstr "最小化" + +#: ../src/cairo-dock-menu.c:1521 msgid "Close all" -msgstr "閉じる" +msgstr "すべて閉じる" -#: ../src/cairo-dock-menu.c:1387 +#: ../src/cairo-dock-menu.c:1540 msgid "Configure this applet" msgstr "このモジュールの設定" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Detach this applet" msgstr "このモジュールを分離" -#: ../src/cairo-dock-menu.c:1391 +#: ../src/cairo-dock-menu.c:1544 msgid "Return to dock" msgstr "ドックに戻す" -#: ../src/cairo-dock-menu.c:1394 +#: ../src/cairo-dock-menu.c:1547 msgid "Remove this applet" msgstr "このモジュールを削除" -#: ../src/cairo-dock-menu.c:1398 +#: ../src/cairo-dock-menu.c:1551 msgid "Launch another instance of this applet" -msgstr "このアプレットをもう1つ起動" +msgstr "このアプレットを追加起動" -#: ../src/cairo-dock-menu.c:1426 +#: ../src/cairo-dock-menu.c:1579 msgid "Normal" -msgstr "普通" +msgstr "通常" -#: ../src/cairo-dock-menu.c:1433 +#: ../src/cairo-dock-menu.c:1586 msgid "Always on top" msgstr "常に最前面に表示" -#: ../src/cairo-dock-menu.c:1440 +#: ../src/cairo-dock-menu.c:1593 msgid "Always below" msgstr "常に最後面に表示" -#: ../src/cairo-dock-menu.c:1456 -#, fuzzy +#: ../src/cairo-dock-menu.c:1606 msgid "set behaviour in Compiz to: (name=cairo-dock & type=utility)" msgstr "Compiz の動作設定での指定法: (name=cairo-dock & type=utility)" -#: ../src/cairo-dock-menu.c:1458 +#: ../src/cairo-dock-menu.c:1608 msgid "Reserve space" -msgstr "" +msgstr "空間を確保" -#: ../src/cairo-dock-menu.c:1465 +#: ../src/cairo-dock-menu.c:1615 msgid "On all desktops" -msgstr "" +msgstr "全デスクトップに配置" # ################################# # ########### cairo-dock.conf ############# # ################################# -#: ../src/cairo-dock-menu.c:1471 -#, fuzzy +#: ../src/cairo-dock-menu.c:1621 msgid "Lock position" -msgstr "合成処理" +msgstr "位置固定" -#: ../src/cairo-dock-modules.c:107 +#: ../src/cairo-dock-modules.c:108 msgid "" "A useful FAQ that contains also a lot of hints.\n" "Let the mouse over a sentence to make the hint dialog popups." @@ -626,22 +659,31 @@ "多くのヒントも含む便利な FAQ。\n" "マウスを説明文上に置くと、ヒント・ダイアログがポップアップ。" -#: ../src/cairo-dock-themes-manager.c:439 +#: ../src/cairo-dock-themes-manager.c:145 +#, c-format +msgid "Downloading file %s ..." +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:186 +#, c-format +msgid "couldn't get distant file %s" +msgstr "" + +#: ../src/cairo-dock-themes-manager.c:468 #, c-format msgid "Are you sure you want to overwrite theme %s ?" msgstr "本当に %s テーマを上書きしますか？" -#: ../src/cairo-dock-themes-manager.c:537 +#: ../src/cairo-dock-themes-manager.c:566 #, c-format msgid "Are you sure you want to delete theme %s ?" msgstr "本当に %s テーマを削除しますか？" -#: ../src/cairo-dock-themes-manager.c:539 -#, fuzzy +#: ../src/cairo-dock-themes-manager.c:568 msgid "Are you sure you want to delete these themes ?" -msgstr "本当に %s テーマを削除しますか？" +msgstr "本当にこれらのテーマを削除しますか？" -#: ../src/cairo-dock-themes-manager.c:601 +#: ../src/cairo-dock-themes-manager.c:630 msgid "" "You made some modifications in the current theme.\n" "You will loose them if you don't save before choosing a new theme. Continue " @@ -651,47 +693,26 @@ "新しいテーマの選択前にあらかじめ保存を行っておかないと、変更が失われてしまい" "ます。かまわず続行しますか？" -#: ../src/cairo-dock-themes-manager.c:637 +#: ../src/cairo-dock-themes-manager.c:666 #, c-format msgid "" "couldn't get distant file %s/%s, maybe the server is down.\n" "Please retry later or contact us at cairo-dock.org." msgstr "" +"遠隔ファイル %s/%s の取得ができませんでした。サーバがダウンしているのかもしれ" +"ません。\n" +"後でもう一度試すか、cairo-dock.org に連絡を取ってみてください。" -#: ../src/cairo-dock-themes-manager.c:807 -msgid "< Safe Mode >" -msgstr "< セーフモード >" - -#: ../src/cairo-dock-themes-manager.c:807 +#: ../src/cairo-dock-themes-manager.c:858 msgid "Manage Themes" msgstr "テーマの管理" -#: ../src/cairo-dock-themes-manager.c:812 -msgid "" -"You are running Cairo-Dock in safe mode.\n" -"Why ? Probably because a plug-in has messed into your dock,\n" -" or maybe your theme has got corrupted.\n" -"So, no plug-in will be available, and you can now save your current theme if " -"you want\n" -" before you start using the dock.\n" -"Try with your current theme, if it works, it means a plug-in is wrong.\n" -"Otherwise, try with another theme.\n" -"Save a config that is working, and restart the dock in normal mode.\n" -"Then, activate plug-ins one by one to guess which one is wrong." -msgstr "" -"セーフモードで Cairo-Dock を実行中です。\n" -"ドック内でプラグインが混乱した状態になっているか、\n" -"テーマ設定が壊れていることが原因と思われます。\n" -"従って、このままではプラグインを利用することはできません。\n" -"ドックの使用を開始する前に現在のテーマを直ちに保存することができます。現在の" -"テーマが機能しているようであればそのテーマを使用してみてください。この場合、" -"プラグインに問題があることになります。\n" -"それ以外の場合には、別のテーマを試してください。機能している設定を保存した上" -"で、ドックを通常モードで再起動させます。\n" -"その後、問題のあるプラグインを特定するため、プラグインを1つずつ有効化してみて" -"ください。" +#: ../src/cairo-dock-themes-manager.c:902 +#, c-format +msgid "couldn't retrieve distant theme %s" +msgstr "" -#: ../src/cairo-dock.c:616 +#: ../src/cairo-dock.c:608 msgid "" "Welcome in Cairo-Dock2 !\n" "A default and simple theme has been loaded.\n" @@ -705,20 +726,20 @@ msgstr "" "Cairo-Dock2 にようこそ！\n" "デフォルトのシンプルなテーマが読み込まれました。\n" -"このドックに手を入れていったり、右クリック -> Cairo-Dock -> テーマ管理から別" -"のテーマを選択することも可能です。\n" +"このドックに手を加えたり、右クリック -> Cairo-Dock -> テーマ管理から別のテー" +"マを選択することも可能です。\n" "右クリック -> Cairo-Dock -> ヘルプから、ドックの使用に役立つヘルプが利用でき" "ます。\n" "質問やリクエスト、意見などがあれば、右クリック -> Cairo-Dock -> コミュニティ" "サイトを訪れてみてください。\n" "このソフトを楽しんでくれることを願っています！\n" -"（このダイアログを閉じるには、ダイアログをクリック）" +"（このダイアログを閉じるには、ダイアログをクリックしてください。）" -#: ../data/messages:3 ../data/messages:979 +#: ../data/messages:3 ../data/messages:983 msgid "Position on the screen" msgstr "画面上の配置位置" -#: ../data/messages:5 ../data/messages:981 +#: ../data/messages:5 ../data/messages:985 msgid "" "The icons will scroll according to the chosen placement type. Of course the " "dock can be placed anywhere on the screen, here we specify regarding to what." @@ -727,27 +748,26 @@ "上のどの位置にも配置可能ですが、ここではその基本となる位置を指定します。" #: ../data/messages:7 -#, fuzzy msgid "Choose which screen border the dock will placed on :" msgstr "ドックを配置する画面端の選択 :" -#: ../data/messages:9 ../data/messages:985 +#: ../data/messages:9 ../data/messages:989 msgid "bottom" msgstr "下" -#: ../data/messages:11 ../data/messages:987 +#: ../data/messages:11 ../data/messages:991 msgid "top" msgstr "上" -#: ../data/messages:13 ../data/messages:989 +#: ../data/messages:13 ../data/messages:993 msgid "right" msgstr "右" -#: ../data/messages:15 ../data/messages:991 +#: ../data/messages:15 ../data/messages:995 msgid "left" msgstr "左" -#: ../data/messages:17 ../data/messages:993 +#: ../data/messages:17 ../data/messages:997 msgid "" "At 0, the dock will place itself regarding the left corner if horizontal and " "the top corner if vertical, at 1 regarding the right corner if horizontal " @@ -758,28 +778,28 @@ "れます。1 に指定すると、水平の場合は右隅に配置され、垂直の場合は下隅に配置さ" "れます。0.5 に指定すると、画面端の中央に配置されます。" -#: ../data/messages:19 ../data/messages:995 +#: ../data/messages:19 ../data/messages:999 msgid "Relative alignment :" msgstr "相対的な配置位置 :" -#: ../data/messages:21 ../data/messages:997 +#: ../data/messages:21 ../data/messages:1001 msgid "Position regarding the chosen screen's edge" msgstr "選択した画面端における位置" -#: ../data/messages:23 ../data/messages:999 +#: ../data/messages:23 ../data/messages:1003 msgid "" "Gap from the absolute position on the screen's edge, in pixels. You can also " "move the dock by holding ALT or CTRL key and left mouse button." msgstr "" -"選択した画面端の基本配置位置からのずれの大きさ（ピクセル単位）です。ALT また" -"は CTRL キーとマウス左ボタンを押しながらドラッグして、ドックを移動させること" -"も可能です。" +"上で選択した画面端での基本配置位置からのずれの大きさ（ピクセル単位）です。" +"ALT または CTRL キーとマウス左ボタンを押しながらドラッグして、ドックを移動さ" +"せることも可能です。" -#: ../data/messages:25 ../data/messages:1001 +#: ../data/messages:25 ../data/messages:1005 msgid "Lateral gap :" msgstr "側面方向へのずれ :" -#: ../data/messages:27 ../data/messages:1003 +#: ../data/messages:27 ../data/messages:1007 msgid "" "in pixels. You can also move the dock by holding ALT or CTRL key and left " "mouse button." @@ -787,7 +807,7 @@ "ピクセル単位。ALT または CTRL キーとマウス左ボタンを押しながらドラッグして、" "ドックを移動させることも可能です。" -#: ../data/messages:29 ../data/messages:1005 +#: ../data/messages:29 ../data/messages:1009 msgid "Distance to the screen's edge :" msgstr "画面の境界までの距離 :" @@ -850,7 +870,7 @@ "ドックからマウスが離れた際にドックを画面外に自動的に隠すとともに、マウスを置" "いてドックを再び呼び出すためのゾーンを表示します。" -#: ../data/messages:55 ../data/messages:1009 +#: ../data/messages:55 ../data/messages:1013 msgid "Activate auto-hide ?" msgstr "自動で隠す？" @@ -961,9 +981,8 @@ msgstr "アプリケーションのクラスを入力（複数の場合はセミコロン「;」で区切る）" #: ../data/messages:101 ../data/messages:117 -#, fuzzy msgid "\t\tExcept the following classes :" -msgstr "対象から除外するクラス :" +msgstr "\t\t適用対象外にするクラスの指定 :" #: ../data/messages:103 msgid "Only show icons whose window is minimized ?" @@ -1072,13 +1091,11 @@ msgid "" "It will notify you even if, for instance, you're watching a video in " "fullscreen." -msgstr "" +msgstr "例えば、全画面表示で動画鑑賞中であったとしても通知します。" #: ../data/messages:149 -#, fuzzy msgid "Force the following applications to demand your attention ?" -msgstr "" -"アプリケーションが注意を求めていることをダイアログ・チップを使用して通知？" +msgstr "指定アプリケーションの注意要求を強制適用？" #: ../data/messages:151 msgid "Signal the applications demanding your attention with an animation ?" @@ -1305,11 +1322,12 @@ #: ../data/messages:247 msgid "You need to re-open the panel. It is deactivated by default on KDE." msgstr "" +"変更適用のためにはパネルを再度開く必要があります。KDE の場合このオプションは" +"無効がデフォルトです。" #: ../data/messages:249 -#, fuzzy msgid "Make the config panel transparent ?" -msgstr "擬似透過によって合成処理をエミュレート？" +msgstr "設定パネルを透明化？" #: ../data/messages:251 msgid "Hidden dock" @@ -1520,16 +1538,15 @@ #: ../data/messages:345 msgid "Margin around the text (in pixels) :" -msgstr "" +msgstr "テキストの周囲の余白（ピクセル単位） :" #: ../data/messages:347 -#, fuzzy msgid "Should the text be oulined ?" -msgstr "アウトラインを表示？" +msgstr "テキストをアウトライン表示？" #: ../data/messages:349 msgid "If false, only the quick-info will have this background color." -msgstr "無効の場合は、クイック・インフォにのみこの背景色が使用されます。" +msgstr "無効の場合は、クイック情報にのみこの背景色が使用されます。" #: ../data/messages:351 msgid "Use background color for labels ?" @@ -2063,11 +2080,12 @@ "Use it to make the indicator rotate according to the position of the dock " "(top/bottom/right/left)" msgstr "" +"ドックの配置位置（画面の上/下/右/下）に応じて標示を回転させたい場合に使用しま" +"す。" #: ../data/messages:607 -#, fuzzy msgid "Rotate the indicator with dock ?" -msgstr "アイコンとともに標示もズーム？" +msgstr "ドックとともに標示も回転？" #: ../data/messages:609 msgid "Indicator of class subdock" @@ -2127,7 +2145,7 @@ msgid "Name of an image to use for the locked emblem :" msgstr "ロック状態の標示に使用する画像の名前 :" -#: ../data/messages:651 ../data/messages:949 ../data/messages:1011 +#: ../data/messages:651 ../data/messages:951 ../data/messages:1015 msgid "Desktop Entry" msgstr "デスクトップエントリ" @@ -2135,19 +2153,19 @@ msgid "Sub-dock's name :" msgstr "サブ・ドックの名前 :" -#: ../data/messages:655 ../data/messages:957 ../data/messages:1013 +#: ../data/messages:655 ../data/messages:959 ../data/messages:1017 msgid "Image's name or path :" msgstr "画像の名前またはパス :" -#: ../data/messages:657 ../data/messages:963 ../data/messages:1015 +#: ../data/messages:657 ../data/messages:965 ../data/messages:1019 msgid "Extra parameters" msgstr "追加的パラメータ" -#: ../data/messages:659 ../data/messages:965 ../data/messages:1017 +#: ../data/messages:659 ../data/messages:967 ../data/messages:1021 msgid "Order you want for this launcher among the others:" msgstr "このランチャーに割り当てる並び順 :" -#: ../data/messages:661 ../data/messages:961 ../data/messages:1019 +#: ../data/messages:661 ../data/messages:963 ../data/messages:1023 msgid "Name of the container it belongs to:" msgstr "帰属先コンテナの名前 :" @@ -2223,7 +2241,7 @@ "このフォルダは実際には ~/.config/cairo-dock/current_theme/icons ディレクトリ" "を指しています。\n" "数多くのテーマやフォルダを登録することが可能で、ドックは登録順にそうしたフォ" -"ルダ等から画像を検索します。\n" +"ルダ等から画像を検索していきます。\n" "\"_LocalIcons_\" も削除して何も登録せず空欄にすると、システムのデフォルトのア" "イコン・テーマが使用されます。" @@ -2249,9 +2267,8 @@ "失します。" #: ../data/messages:691 -#, fuzzy msgid "How can I resize my icons ?" -msgstr "アイコンを並べ替えるには？" +msgstr "アイコンのサイズを変更するには？" #: ../data/messages:693 msgid "" @@ -2259,6 +2276,9 @@ "smaller or equal than the default size. Set it to 0x0 to use the default " "size." msgstr "" +"ヒント : デフォルトと同じかそれよりも小さい大きさの範囲内で、各アプレットごと" +"にそれぞれ大きさを指定することが可能です。デフォルトの大きさを使用するには " +"0x0 に設定します。" #: ../data/messages:695 msgid "" @@ -2266,6 +2286,9 @@ "type : launchers, applis, applets and separators.\n" "You can also setup the zoom factor." msgstr "" +"「アイコン」モジュールから、ランチャー、アプリ、アプレット等の種類に応じたア" +"イコンのデフォルトの大きさの設定が可能です。\n" +"また、ズーム率の設定も行うことができます。" #: ../data/messages:697 msgid "Dock" @@ -2597,7 +2620,6 @@ "レイヤ画面を一度呼び出してやる必要があるかもしれません。" #: ../data/messages:789 -#, fuzzy msgid "" "In the Compiz-Fusion config, activate the 'Widget Layer' plug-in, and set " "the rule (name=cairo-dock & type=utility).\n" @@ -2606,7 +2628,7 @@ msgstr "" "Compiz-Fusion の設定から「ウィジェット・レイヤ」プラグインを有効にして、" "(name=cairo-dock & type=utility) というルールを登録します。\n" -"その上で、デスクレット上を左クリックして、メニューから「Compiz-Fusion " +"その上で、デスクレット上を右クリックして、メニューから「Compiz-Fusion " "Widget」を選択します。" #: ../data/messages:791 @@ -2692,7 +2714,8 @@ #: ../data/messages:813 msgid "" -"Hint : to launch another instance of theprogram, shift+click on the launcher." +"Hint : to launch another instance of the program, shift+click on the " +"launcher." msgstr "" "ヒント : プログラムの別のインスタンスを追加的に起動させたい場合は、Shift を押" "しながらランチャーをクリックします。" @@ -2726,28 +2749,44 @@ " and in the “Extra parameters”, tick the box that says to not steal the icon " "for this appli." msgstr "" +"X アイコンを上書きする設定を選択した場合、このオプションのすぐ下で Pidgin を" +"除外対象に追加することが可能です。\n" +"アプリとランチャーの混在配置を選択した場合は、Pidgin ランチャーの設定を編集し" +"て、\n" +"追加的パラメータにある「このアプリにアイコンを奪取させない」というオプション" +"にチェックを入れます。" #: ../data/messages:821 msgid "" +"How can I quickly navigate between many windows of the same application ?" +msgstr "同じアプリケーションのウィンドウ同士の間で素早く切り替えを行うには？" + +#: ../data/messages:823 +msgid "" "Hint : you can also close all the windows of this appli by middle-clicking " "on the icon pointing on the sub-dock." msgstr "" +"ヒント : サブ・ドックを含んだアイコン上で中クリックして、このアプリのウィンド" +"ウをすべて閉じることもできます。" -#: ../data/messages:823 +#: ../data/messages:825 msgid "" -"croll on the icon of one of the windows of this appli, or even on the icon " +"Scroll on the icon of one of the windows of this appli, or even on the icon " "pointing on the sub-dock if you group windows in a sub-dock." msgstr "" +"アプリのウィンドウ・アイコンの内の１つか、またはウィンドウをサブ・ドックにグ" +"ループ化させている場合はそのアイコンの上で、\n" +"マウス・スクロールしてください。" -#: ../data/messages:825 +#: ../data/messages:827 msgid "Replacing the gnome-panel" msgstr "Gnome パネルとの置き換え" -#: ../data/messages:827 +#: ../data/messages:829 msgid "How can I have the main menu ?" msgstr "メイン・メニューを利用するには？" -#: ../data/messages:829 +#: ../data/messages:831 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F1” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the menu at the " @@ -2757,15 +2796,15 @@ "キーは働かなくなります。このアプレットは、マウスの場所にメニューをポップアッ" "プするショートカットの設定が可能です。" -#: ../data/messages:831 +#: ../data/messages:833 msgid "activate the Gmenu applet." msgstr "Gmenu アプレットを有効にしてください。" -#: ../data/messages:833 +#: ../data/messages:835 msgid "How can I have a simple “quick launch” panel ?" msgstr "シンプルな「クイック起動」パネルを利用するには？" -#: ../data/messages:835 +#: ../data/messages:837 msgid "" "Hint : if you removed your gnome-panel, then the “alt+F2” shortkey does not " "work anymore. This applet let you setup a shortcut to pop up the quick-" @@ -2775,17 +2814,17 @@ "キーは働かなくなります。このアプレットは、クイック起動ダイアログをポップアッ" "プさせるショートカットの設定を可能にします。" -#: ../data/messages:837 +#: ../data/messages:839 msgid "" "activate the Gmenu applet, then you can have it by middle-clicking on its " "icon." msgstr "Gmenu アプレットを有効にして、そのアイコンを中クリックしてください。" -#: ../data/messages:839 +#: ../data/messages:841 msgid "How can I have a logout icon ?" msgstr "ログアウトのアイコンを利用するには？" -#: ../data/messages:841 +#: ../data/messages:843 msgid "" "Hint : In the last Gnome version, there are 2 panel : one to logout, and one " "to turn off computer. The first one is raised by a click on the icon, the " @@ -2797,15 +2836,15 @@ "表示されますが、このアプレットではその振る舞いを交替させたり、任意のコマンド" "を入力したりすることが可能です。 " -#: ../data/messages:843 +#: ../data/messages:845 msgid "Simply activate the “logout” applet." msgstr "単純に「logout」アプレットを有効にします。" -#: ../data/messages:845 +#: ../data/messages:847 msgid "How can I access the dustbin ?" msgstr "ゴミ箱にアクセスするには？" -#: ../data/messages:847 +#: ../data/messages:849 msgid "" "Hint : you can delete a file by dragging it into the dustbin. You can even " "unmount a mount-point this way !" @@ -2813,15 +2852,15 @@ "ヒント : dustbin アイコンにファイルをドラッグして、ファイルを削除することが可" "能です。同様の方法でマウント・ポイントをアンマウントすることもできます。" -#: ../data/messages:849 +#: ../data/messages:851 msgid "Simply activate the “dustbin” applet." msgstr "単純に「dustbin」アプレットを有効にします。" -#: ../data/messages:851 +#: ../data/messages:853 msgid "How can I access to my mount points ?" msgstr "マウント・ポイントにアクセスするには？" -#: ../data/messages:853 +#: ../data/messages:855 msgid "" "Hint : you can mount a volume by clicking on its icon. To unmount it, right-" "click and select “unmount”." @@ -2829,15 +2868,15 @@ "ヒント : ボリュームのアイコンをクリックすると、マウントすることができます。ア" "ンマウントするには、アイコンを右クリックして「アンマウント」を選択します。" -#: ../data/messages:855 ../data/messages:861 +#: ../data/messages:857 ../data/messages:863 msgid "Simply activate the “shortcuts” applet." msgstr "単純に「shortcuts」アプレットを有効にします。" -#: ../data/messages:857 +#: ../data/messages:859 msgid "How can I access to my Nautilus bookmarks ?" msgstr "Nautilus ブックマークにアクセスするには？" -#: ../data/messages:859 +#: ../data/messages:861 msgid "" "Hint : you can add a bookmark by dragging the folder onto the applet or into " "its sub-dock. You can also rename and remove them. This will also take " @@ -2847,39 +2886,39 @@ "を追加することが可能です。フォルダの名前変更や削除を行うこともでき、それらは " "Nautilus に直ちに反映され、その逆も同様です。" -#: ../data/messages:863 +#: ../data/messages:865 msgid "How can I access to my desktop ?" msgstr "デスクトップにアクセスするには？" -#: ../data/messages:865 +#: ../data/messages:867 msgid "" "Hint : middle-clicking on it will hide all the windows, but not the desklets." msgstr "" "ヒント : アプレットを中クリックすると、デスクレット以外のすべてのウィンドウを" "隠します。" -#: ../data/messages:867 +#: ../data/messages:869 msgid "Simply activate the “show desktop” applet." -msgstr "単純に「show desktop」アプレットを有効にします。" +msgstr "単純に「デスクトップ表示」アプレットを有効にします。" -#: ../data/messages:869 +#: ../data/messages:871 msgid "How can I have an easy-to-acces calendar ?" msgstr "簡単にアクセス可能なカレンダーを利用するには？" -#: ../data/messages:871 +#: ../data/messages:873 msgid "" "activate the “clock” applet; clicking on it will display a calendar, " "clicking again will hide it." msgstr "" -"「clock」アプレットを有効にしてそのアイコンをクリックするとカレンダーが表示さ" +"「時計」アプレットを有効にしてそのアイコンをクリックするとカレンダーが表示さ" "れます。\n" "もう一度クリックすると隠れます。" -#: ../data/messages:873 +#: ../data/messages:875 msgid "How can I have the notification area (also called systray) ?" msgstr "通知エリア（systray）を利用するには？" -#: ../data/messages:875 +#: ../data/messages:877 msgid "" "activate the “systray” applet. For the moment it can’t be displayed directly " "into the dock,\n" @@ -2895,14 +2934,14 @@ "アプレットをドックから分離させてデスクレットとして画面の隅に配置し、最前面表" "示させることをお勧めします。" -#: ../data/messages:877 +#: ../data/messages:879 msgid "" "How can I have an easy-to-access terminal with real transparence, like " "Tilda ?" msgstr "" "Tilda のような本当の透過に対応した簡単にアクセス可能な端末を利用するには？" -#: ../data/messages:879 +#: ../data/messages:881 msgid "" "Hint : clicking next to the last tab will create a new tab. Double-clicking " "on a tab allows you to rename it. You can even change the color of a tab !" @@ -2910,20 +2949,21 @@ "ヒント : 最後のタブの隣をクリックすると、新しいタブが作成されます。タブをダブ" "ルクリックすると、名前の変更ができます。タブの色の変更も可能です！" -#: ../data/messages:881 +#: ../data/messages:883 msgid "" "activate the “terminal” applet. You can detach it and place it on the Widget " "Layer for instance, or setup a shorkey to make it pop-up instantly." msgstr "" "「terminal」アプレットを有効にします。アプレットを分離させて、例えば Compiz " "のウィジット・レイヤ上に置いたり、\n" -"ショートカット設定して素早くポップアップ表示させることが可能です。" +"キーボードショートカットを設定して素早くポップアップ表示させることが可能で" +"す。" -#: ../data/messages:883 +#: ../data/messages:885 msgid "So then, how can I remove completely the gnome-panel ?" msgstr "では、Gnome パネルを画面から完全に取り除くには？" -#: ../data/messages:885 +#: ../data/messages:887 msgid "" "Open gconf-editor, edit the key /desktop/gnome/session/" "required_components_list, and erase its content (\"panel\").\n" @@ -2934,15 +2974,15 @@ "キーの値（”gnome-panel”）を消して空にします。\n" "セッションを再スタートすると、それ以後 Gnome パネルは起動しなくなります。" -#: ../data/messages:887 +#: ../data/messages:889 msgid "Other applets" msgstr "その他のアプレット" -#: ../data/messages:889 +#: ../data/messages:891 msgid "How can I have a same applet many times ?" msgstr "同じアプレットを複数同時に使用するには？" -#: ../data/messages:891 +#: ../data/messages:893 msgid "" "Hint : This allows you, for example, to have the time of different countries " "in your dock, or to have many animated caracters in your dock, or the " @@ -2951,7 +2991,7 @@ "ヒント : これによって、例えばドックに複数の国の時間や都市の天気を同時に表示さ" "せたり、複数のキャラクターをドック上で動かすことが可能です。" -#: ../data/messages:893 +#: ../data/messages:895 msgid "" "Some applets can run several times at the same time : Clock, Cairo-Penguin, " "Weather, Netspeed, …\n" @@ -2966,13 +3006,14 @@ "アプレットの新しいインスタンスがメイン・ドックに現れます。\n" "他のアプレットと同じように、この新しいアプレットの設定を行うことができます。" -#: ../data/messages:895 +#: ../data/messages:897 msgid "" "I have a personal gauge that I want to use in the dock (for cpusage or " "others)" -msgstr "Cpusage やその他のアプレットで使用したい個人的なゲージ画像があります" +msgstr "" +"「CPU使用率」やその他のアプレットで使用したい個人的なゲージ画像があります" -#: ../data/messages:897 +#: ../data/messages:899 msgid "" "move the folder containing your gauge in ~/.config/cairo-dock/extras/gauges, " "you’re done !" @@ -2980,20 +3021,20 @@ "自分のゲージ画像を含んだフォルダを ~/.config/cairo-dock/extras/gauges に移動" "させるだけで完了です！" -#: ../data/messages:899 +#: ../data/messages:901 msgid "" "I have a personal Cairo-Clock theme that I want to use in the “clock” applet." -msgstr "Clock アプレットで使用したい個人的な Cairo-Clock テーマがあります" +msgstr "「時計」アプレットで使用したい個人的な Cairo-Clock テーマがあります" -#: ../data/messages:901 +#: ../data/messages:903 msgid "" "Hint : the same goes on for all the applets that propose a theme : dustbin, " "Cairo-Penguin, weather, etc." msgstr "" "ヒント : テーマを提供している他のすべてのアプレット（dustbin, Cairo-Penguin, " -"weather 等）も同様です。" +"天気予報等）も同様です。" -#: ../data/messages:903 +#: ../data/messages:905 msgid "" "move the folder containing your theme in ~/.config/cairo-dock/extras/clock, " "you’re done !" @@ -3001,22 +3042,22 @@ "自分のテーマを含んだフォルダを ~/.config/cairo-dock/extras/clock に移動させる" "だけで完了です！ " -#: ../data/messages:905 +#: ../data/messages:907 msgid "How can I change quickly the luminosity of my screen ?" msgstr "画面の明るさを素早く変更するには？" -#: ../data/messages:907 +#: ../data/messages:909 msgid "" "Activate the Xgamma applet, then you can scroll up/down on the icon with the " "mouse." msgstr "" "Xgamma アプレットを有効にし、そのアイコン上でマウスを上下スクロールさせます。" -#: ../data/messages:909 +#: ../data/messages:911 msgid "How can I change quickly the speakers volume ?" msgstr "スピーカーの音量を素早く変更するには？" -#: ../data/messages:911 +#: ../data/messages:913 msgid "" "Activate the AlsaMixer applet, then you can scroll up/down on the icon with " "the mouse." @@ -3024,15 +3065,21 @@ "AlsaMixer アプレットを有効にし、そのアイコン上でマウスを上下スクロールさせま" "す。" -#: ../data/messages:913 +#: ../data/messages:915 msgid "Troubleshooting" msgstr "問題解決" -#: ../data/messages:915 +#: ../data/messages:917 msgid "I have a black background around my dock" msgstr "ドック周りの背景が黒くなってしまっています" -#: ../data/messages:917 +#: ../data/messages:919 +msgid "" +"Hint : If yo have an ATI or an Intel, you should try without OpenGL first, " +"because their drivers are not yet perfect." +msgstr "" + +#: ../data/messages:921 msgid "" "You have to turn on the compositing. For instance, you can run Compiz or " "xcompmgr. \n" @@ -3044,11 +3091,11 @@ "XFCE や KDE 環境を使用している場合は、ウィンドウ・マネージャのオプションから" "コンポジット機能を有効にできます。" -#: ../data/messages:919 +#: ../data/messages:923 msgid "My machine is too old to run a composite manager" msgstr "自分のマシンはコンポジット・マネージャを実行するには古すぎます" -#: ../data/messages:921 +#: ../data/messages:925 msgid "" "Don’t panic, Cairo-Dock can emulate the transparency.\n" "So to get rid of the black background, just activate the corresponding " @@ -3058,15 +3105,11 @@ "黒い背景を取り除くには、「システム」モジュール設定画面の最後にある擬似透過オ" "プションを有効にします。" -#: ../data/messages:923 +#: ../data/messages:927 msgid "The dock is horribly slow when I move the mouse into it" msgstr "マウスをドックに動かしたときのドックの動作が非常に遅いです" -#: ../data/messages:925 -msgid "Hint : " -msgstr "" - -#: ../data/messages:927 +#: ../data/messages:929 msgid "" "If you have a GeForce8, you have to install the latest drivers, because the " "first ones were really buggy.\n" @@ -3082,11 +3125,11 @@ "OpenGL ありで実行している場合は、\"cairo-dock -c\" コマンドでドックを起動し" "て、OpenGL を無効化してみてください。" -#: ../data/messages:929 +#: ../data/messages:931 msgid "I don’t have these wonderful effects like fire, cube rotating, etc" msgstr "炎やキューブ回転などの素晴らしいエフェクトが使用できません" -#: ../data/messages:931 +#: ../data/messages:933 msgid "" "Hint : You can force the openGL by launching the dock with “cairo-dock –o”." "but you might get a lot of visual artifacts." @@ -3094,7 +3137,7 @@ "ヒント : \"cairo-dock -o\" コマンドでドックを起動させることにより、OpenGL を" "強制使用することが可能ですが、画像の乱れが数多く発生するかもしれません。" -#: ../data/messages:933 +#: ../data/messages:935 msgid "" "You need a graphic card with drivers that support openGL2.0. Most of Nvidia " "cards can do that, more and more Intel cards can do too. Most of ATI cards " @@ -3105,11 +3148,11 @@ "す。\n" "ATI カードはほとんど対応していません。" -#: ../data/messages:935 +#: ../data/messages:937 msgid "The “netspeed” applet displays 0 even when I’m downloading something" msgstr "ダウンロード中であっても「netspeed」アプレットは 0 を表示したままです" -#: ../data/messages:937 +#: ../data/messages:939 msgid "" "Hint : you can instantiate this applet many times if you want to monitor " "many interfaces." @@ -3117,7 +3160,7 @@ "ヒント : 監視したいインターフェイスが複数の場合、このアプレットを複数同時に利" "用することが可能です。" -#: ../data/messages:939 +#: ../data/messages:941 msgid "" "You have to tell it which interface you’re using to connect to the Net (by " "default, it’s “eth0”).\n" @@ -3133,11 +3176,11 @@ "恐らく \"eth1\" や \"ath0\" 、\"wifi0\" のような名前になっていると思われま" "す。" -#: ../data/messages:941 +#: ../data/messages:943 msgid "The dustbin remains empty even when I delete a file" msgstr "ファイルを削除してもゴミ箱（dustbin）が空のままです" -#: ../data/messages:943 +#: ../data/messages:945 msgid "" "if you’re under KDE, you may have to tell it the path of the trash folder.\n" "Just edit the applet’s configuration, and fill in the Trash path; it is " @@ -3150,11 +3193,11 @@ "パスの入力には十分注意してください！！！（スペース等の見えない文字記号を挿入" "しないように）" -#: ../data/messages:945 +#: ../data/messages:947 msgid "Help us !" msgstr "支援求む！" -#: ../data/messages:947 +#: ../data/messages:949 msgid "" "We value your help ! If you see a bug, or if you think something could be " "improved,\n" @@ -3169,8 +3212,8 @@ "ユーザーからの支援を重視しています！\n" "バグを発見したり改善点を思いついた場合には、cairo-dock.org を訪問してみてくだ" "さい。\n" -"単にドックのことを考えただけでも結構です。英語を話す人も歓迎なので遠慮なく！ " -"^_−☆\n" +"ドックのことを単に思い浮かべただけのときでも結構です。英語を話す人も歓迎なの" +"で遠慮なく！ ^_−☆\n" "ドック用のテーマやアプレットを作成して他のユーザーと共有したい場合には、\n" "喜んでそれらを他のテーマと一緒に組み込みます！\n" "Fabounet" @@ -3178,11 +3221,11 @@ # ################################# # ########### launcher.conf ############# # ################################# -#: ../data/messages:951 +#: ../data/messages:953 msgid "Launcher's name :" msgstr "ランチャーの名前 :" -#: ../data/messages:953 +#: ../data/messages:955 msgid "" "Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard " "shortcut, for exemple F1 for the Applications Menu, c or v " @@ -3192,11 +3235,11 @@ "ケーションメニューを開く F1 や、コピーや貼り付けの c , v の" "ようにキーボードショートカットを指定することもできます。 " -#: ../data/messages:955 +#: ../data/messages:957 msgid "Command to launch on click :" msgstr "クリック時に実行するコマンド :" -#: ../data/messages:959 +#: ../data/messages:961 msgid "" "If you write here a container's name that doesn't exist yet, a new one will " "be created, with this icon inside." @@ -3204,19 +3247,22 @@ "ここに既存にないコンテナの名前を入力すると、このアイコンを含んだ新しいコンテ" "ナが作成されます。" -#: ../data/messages:967 +#: ../data/messages:969 msgid "" "If you choosed to mix launcher and applis, this option will deactivate this " "behaviour for this launcher only. It can be useful for instance for a " "launcher that launches a script in a terminal, but you don't want it to " "steal the Terminal's icon from the Taskbar." msgstr "" +"このオプションを有効にすると、ランチャーとアプリの一体化を選択している場合" +"に、その対象からこのランチャーを除外します。端末内でスクリプトを実行するラン" +"チャーに、タスクバーから端末のアイコンを奪取させたくない場合などに有用です。" -#: ../data/messages:969 +#: ../data/messages:971 msgid "Prevent this launcher from stealing appli from taskbar ?" msgstr "このランチャーにタスクバーからアプリーションを奪取させない？" -#: ../data/messages:971 +#: ../data/messages:973 msgid "" "The only reason you may want to modify this parameter is if you made this " "launcher by hands. If you dropped it into the dock from the menu, it is " @@ -3229,21 +3275,24 @@ "ん。このパラメータはプログラムのクラスを定義し、ランチャーとアプリケーション" "を結びつけるのに有用です。" -#: ../data/messages:973 +#: ../data/messages:975 msgid "Class of the program :" msgstr "プログラムのクラス :" -#: ../data/messages:975 +#: ../data/messages:977 +msgid "It will use 'xterm'." +msgstr "" + +#: ../data/messages:979 msgid "Run in a terminal ?" msgstr "端末内で実行？" -#: ../data/messages:983 -#, fuzzy +#: ../data/messages:987 msgid "" "Choose the screen border regarding to which the dock will place itself :" msgstr "ドックを配置する画面端の選択 :" -#: ../data/messages:1007 +#: ../data/messages:1011 msgid "" "The dock will automatically hide itself outside of the scren when the mouse " "leaves it and will show a callback zone instead. Place the mouse into this " @@ -3255,27 +3304,27 @@ # ################################# # ########### themes.conf ############# # ################################# -#: ../data/messages:1021 +#: ../data/messages:1025 msgid "Themes" msgstr "テーマ" -#: ../data/messages:1023 +#: ../data/messages:1027 msgid "Choose a theme" msgstr "テーマ選択" -#: ../data/messages:1025 +#: ../data/messages:1029 msgid "Choose one of the available themes :" -msgstr "" +msgstr "利用可能なテーマから１つ選択 :" -#: ../data/messages:1027 +#: ../data/messages:1031 msgid "You can even drop an internet URL." -msgstr "" +msgstr "インターネット URL をドロップすることもできます。" -#: ../data/messages:1029 +#: ../data/messages:1033 msgid "... or drag and drop a theme package here :" -msgstr "" +msgstr "... または、テーマのパッケージをここにドラッグ＆ドロップ :" -#: ../data/messages:1031 +#: ../data/messages:1035 msgid "" "So if you check this box, your launchers will be deleted and replaced by the " "ones provided in the new theme. Otherwise the current launchers will be " @@ -3285,11 +3334,11 @@ "提供されるものに置き換えられます。チェックを入れない場合は現在のランチャーが" "保持され、アイコンのみが置き換えられます。" -#: ../data/messages:1033 +#: ../data/messages:1037 msgid "Use the new theme's launchers ?" msgstr "新しいテーマのランチャーを使用？" -#: ../data/messages:1035 +#: ../data/messages:1039 msgid "" "Otherwise the current behaviour will be kept. It's all about the dock's " "position, behaviour parameters such as auto-hide, using taskbar or not, etc." @@ -3297,62 +3346,64 @@ "使用しない場合は現在の動作、すなわちドックの配置位置や自動で隠すか否かの設" "定、タスクバー使用不使用の設定などといった動作パラメータが維持されます。" -#: ../data/messages:1037 +#: ../data/messages:1041 msgid "Use the new theme's behaviour ?" msgstr "新しいテーマの動作設定を使用？" -#: ../data/messages:1039 +#: ../data/messages:1043 msgid "Save" msgstr "保存" -#: ../data/messages:1041 +#: ../data/messages:1045 msgid "Save current theme" msgstr "現在のテーマを保存" -#: ../data/messages:1043 +#: ../data/messages:1047 msgid "You will then be able to re-open it at any time." msgstr "保存しておけば、いつでも再び開くことができます。" -#: ../data/messages:1045 +#: ../data/messages:1049 msgid "Save as :" msgstr "名前を付けて保存 :" -#: ../data/messages:1047 +#: ../data/messages:1051 msgid "Save current behaviour too ?" msgstr "現在の動作設定も保存？" -#: ../data/messages:1049 +#: ../data/messages:1053 msgid "Save current launchers too ?" msgstr "現在のランチャーも保存？" -#: ../data/messages:1051 +#: ../data/messages:1055 msgid "" "The dock will build a complete tarball of your current theme, allowing you " "to exchange it easily with other people." msgstr "" +"ドックは現在のテーマ一式の tarball を作成して、他のユーザーと簡単にテーマの交" +"換ができるようにします。" -#: ../data/messages:1053 +#: ../data/messages:1057 msgid "Build a package of the theme ?" -msgstr "" +msgstr "このテーマのパッケージを作成？" -#: ../data/messages:1055 +#: ../data/messages:1059 msgid "Delete" msgstr "削除" -#: ../data/messages:1057 +#: ../data/messages:1061 msgid "List of your personnal themes" msgstr "個人的テーマのリスト" -#: ../data/messages:1059 +#: ../data/messages:1063 msgid "Delete from the list themes you don't want anymore :" msgstr "不要になったテーマのチェックを外してリストから削除 :" -#: ../data/messages:1061 +#: ../data/messages:1065 msgid "pouet" msgstr "" -#: ../data/messages:1063 ../data/messages:1065 ../data/messages:1067 -#: ../data/messages:1069 +#: ../data/messages:1067 ../data/messages:1069 ../data/messages:1071 +#: ../data/messages:1073 msgid "" "v1.4.6.3 :\n" "Just to say :\n" @@ -3363,7 +3414,7 @@ # ################################# # ########### ChangeLog ############# # ################################# -#: ../data/messages:1071 +#: ../data/messages:1075 msgid "" "v1.5.0 : it's been 1 month since previous release, and we worked hardly to " "bring you :\n" @@ -3383,7 +3434,7 @@ " Now, why not try to make an applet for Cairo-Dock ? ;-)" msgstr "" -#: ../data/messages:1073 +#: ../data/messages:1077 msgid "" "v1.5.1 :\n" " - The 1.5 branch is still young, so this version brings a lot of bug fixes\n" @@ -3395,7 +3446,7 @@ " and behave as real desklets." msgstr "" -#: ../data/messages:1075 +#: ../data/messages:1079 msgid "" "v1.5.2.1 :\n" " - a lot of bug fixes, especially on desklets.\n" @@ -3403,7 +3454,7 @@ " - Cairo-Dock is now fully translated in Japanese, thanks to Jiro Kawada !" msgstr "" -#: ../data/messages:1077 +#: ../data/messages:1081 msgid "" "v1.5.3.2 :\n" " - Themes have been deeply reviewed\n" @@ -3417,7 +3468,7 @@ " who could help cairo-dock to be well-integrated into KDE ;-)" msgstr "" -#: ../data/messages:1079 +#: ../data/messages:1083 msgid "" "v1.5.4.2 : a huge release !\n" " - add a cute pinguin in your dock with the new applet Cairo-Penguin\n" @@ -3431,7 +3482,7 @@ " - 3 more themes in Weather" msgstr "" -#: ../data/messages:1081 +#: ../data/messages:1085 msgid "" "v1.5.5.4 :\n" " - Huge enhancements in the TaskBar :\n" @@ -3447,7 +3498,7 @@ "soon ;-)" msgstr "" -#: ../data/messages:1083 +#: ../data/messages:1087 msgid "" "v1.5.6 :\n" " - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still " @@ -3465,7 +3516,7 @@ " - Any help would be welcome to integrate the dock into KDE !" msgstr "" -#: ../data/messages:1085 +#: ../data/messages:1089 msgid "" "v1.6.0 :\n" " - A new view has appeared : Diapositive !\n" @@ -3484,7 +3535,7 @@ " - Real window thumbnail when minimized." msgstr "" -#: ../data/messages:1087 +#: ../data/messages:1091 msgid "" "v1.6.1 :\n" "Cairo-Dock has one year ! To celebrate this event, we are happy to offer " @@ -3497,7 +3548,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1089 +#: ../data/messages:1093 msgid "" "v1.6.2 : the first version integrated in the Ubuntu repositories !\n" " - 2 new applets have been released :\n" @@ -3510,7 +3561,7 @@ "plug-in ^_^" msgstr "" -#: ../data/messages:1091 +#: ../data/messages:1095 msgid "" "v1.6.3 : \n" " - first the bad news :\n" @@ -3528,7 +3579,7 @@ " - The dock is now translated in Sweden and partially in Greek." msgstr "" -#: ../data/messages:1093 +#: ../data/messages:1097 msgid "" "Cairo-Dock II\n" " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " @@ -3542,37 +3593,70 @@ msgstr "" "Cairo-Dock II\n" " - Cairo-Dock の完全 OpenGL ドック化！（旧型グラフィックカードや ATI 向けに " -"Cairo バックエンドの利用は依然として可能）\n" +"Cairo バックエンドの利用は依然可能）\n" " - 新しいプラグインによる多彩な視覚効果 : Animated icons, icon effects, " "illusion, drop indicator, motion blur, dialog rendering\n" " - 設定パネルの大幅な改変\n" " - デスクレットの 3D 表示\n" -" - 新しいアプレット : mail, keyboard indicator, quick folder\n" +" - 新しいアプレット : mail, keyboard indicator, quick folder, Toons.\n" " - 多くのバグ修正とすべてのプラグインのアップグレード" -#: ../data/messages:1095 -#, fuzzy +#: ../data/messages:1099 msgid "" -"Cairo-Dock II\n" -" - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " -"available for old graphic cards or ATI)\n" -" - New plug-ins provide many visual affects : Animated icons, icon effects, " -"illusion, drop indicator, motion blur, dialog rendering\n" -" - The config panel has been widely rewritten.\n" -" - Desklets are now in 3D\n" -" - New applets : mail, keyboard indicator, quick folder, Toons.\n" -" - Lot of bug fixes and upgrades in all plug-ins.\n" -" - 2.0.3 : some bug fixes + improvment of the config panel." +"2.0.5 :\n" +" - This is mainly a bug-fix version\n" +" - improvment in the RB applet\n" +" - Added functionnalities on grouped applications icons." msgstr "" -"Cairo-Dock II\n" -" - Cairo-Dock の完全 OpenGL ドック化！（旧型グラフィックカードや ATI 向けに " -"Cairo バックエンドの利用は依然として可能）\n" -" - 新しいプラグインによる多彩な視覚効果 : Animated icons, icon effects, " -"illusion, drop indicator, motion blur, dialog rendering\n" -" - 設定パネルの大幅な改変\n" -" - デスクレットの 3D 表示\n" -" - 新しいアプレット : mail, keyboard indicator, quick folder\n" -" - 多くのバグ修正とすべてのプラグインのアップグレード" + +#~ msgid "< Safe Mode >" +#~ msgstr "< セーフモード >" + +#~ msgid "" +#~ "You are running Cairo-Dock in safe mode.\n" +#~ "Why ? Probably because a plug-in has messed into your dock,\n" +#~ " or maybe your theme has got corrupted.\n" +#~ "So, no plug-in will be available, and you can now save your current theme " +#~ "if you want\n" +#~ " before you start using the dock.\n" +#~ "Try with your current theme, if it works, it means a plug-in is wrong.\n" +#~ "Otherwise, try with another theme.\n" +#~ "Save a config that is working, and restart the dock in normal mode.\n" +#~ "Then, activate plug-ins one by one to guess which one is wrong." +#~ msgstr "" +#~ "セーフモードで Cairo-Dock を実行中です。\n" +#~ "ドック内でプラグインが混乱した状態になっているか、\n" +#~ "テーマ設定が壊れていることが原因と思われます。\n" +#~ "従って、このままではプラグインを利用することはできません。\n" +#~ "ドックの使用を開始する前に現在のテーマを直ちに保存することができます。現在" +#~ "のテーマが機能しているようであればそのテーマを使用してみてください。この場" +#~ "合、プラグインに問題があることになります。\n" +#~ "それ以外の場合には、別のテーマを試してください。機能している設定を保存した" +#~ "上で、ドックを通常モードで再起動させます。\n" +#~ "その後、問題のあるプラグインを特定するため、プラグインを1つずつ有効化して" +#~ "みてください。" + +#~ msgid "" +#~ "Cairo-Dock II\n" +#~ " - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still " +#~ "available for old graphic cards or ATI)\n" +#~ " - New plug-ins provide many visual affects : Animated icons, icon " +#~ "effects, illusion, drop indicator, motion blur, dialog rendering\n" +#~ " - The config panel has been widely rewritten.\n" +#~ " - Desklets are now in 3D\n" +#~ " - New applets : mail, keyboard indicator, quick folder, Toons.\n" +#~ " - Lot of bug fixes and upgrades in all plug-ins.\n" +#~ " - 2.0.3 : some bug fixes + improvment of the config panel." +#~ msgstr "" +#~ "Cairo-Dock II\n" +#~ " - Cairo-Dock の完全 OpenGL ドック化！（旧型グラフィックカードや ATI 向け" +#~ "に Cairo バックエンドの利用は依然として可能）\n" +#~ " - 新しいプラグインによる多彩な視覚効果 : Animated icons, icon effects, " +#~ "illusion, drop indicator, motion blur, dialog rendering\n" +#~ " - 設定パネルの大幅な改変\n" +#~ " - デスクレットの 3D 表示\n" +#~ " - 新しいアプレット : mail, keyboard indicator, quick folder, Toons\n" +#~ " - 多くのバグ修正とすべてのプラグインのアップグレード" #~ msgid "Should the applications with same PID be displayed only once ?" #~ msgstr "同じ PID を持つアプリーションの表示は１つだけに限定？" @@ -3591,3 +3675,17 @@ #~ "クバーから奪取させたくない場合や、Pidgin のアイコンが連絡先のアバターを表" #~ "示するなどタスクバーのオリジナルのアイコンに情報提供的な機能があるためそれ" #~ "を使いたい場合は、このオプションを使用してください。" + +#~ msgid "" +#~ "couldn't get distant file %s/%s, maybe the server is down.\n" +#~ "Please retry later or contact the administrator." +#~ msgstr "" +#~ "ファイル %s/%s の取得ができませんでした。サーバがダウンしているのかもしれ" +#~ "ません。\n" +#~ "また後で試してみるか、管理者に連絡を取ってみてください。" + +#~ msgid "Except the following classes :" +#~ msgstr "対象から除外するクラス :" + +#~ msgid "List of themes :" +#~ msgstr "テーマのリスト :" diff -Nru cairo-dock-2.0.3/src/cairo-dock-applet-facility.c cairo-dock-2.0.5/src/cairo-dock-applet-facility.c --- cairo-dock-2.0.3/src/cairo-dock-applet-facility.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-applet-facility.c 2009-06-10 01:19:12.000000000 +0200 @@ -30,11 +30,12 @@ #include "cairo-dock-internal-icons.h" #include "cairo-dock-icons.h" #include "cairo-dock-container.h" +#include "cairo-dock-gui-manager.h" #include "cairo-dock-applet-facility.h" extern gchar *g_cCurrentThemePath; extern gchar *g_cCairoDockDataDir; - +extern gchar *g_cConfFile; extern cairo_surface_t *g_pIconBackgroundImageSurface; extern double g_iIconBackgroundImageWidth, g_iIconBackgroundImageHeight; @@ -601,3 +602,13 @@ { cairo_dock_popup_module_instance_description (pModuleInstance); } + + +void cairo_dock_open_module_config_on_demand (int iClickedButton, GtkWidget *pInteractiveWidget, CairoDockModuleInstance *pModuleInstance, CairoDialog *pDialog) +{ + if (iClickedButton == 0 || iClickedButton == -1) // bouton OK ou touche Entree. + { + cairo_dock_build_main_ihm (g_cConfFile, FALSE); + cairo_dock_present_module_instance_gui (pModuleInstance); + } +} diff -Nru cairo-dock-2.0.3/src/cairo-dock-applet-facility.h cairo-dock-2.0.5/src/cairo-dock-applet-facility.h --- cairo-dock-2.0.3/src/cairo-dock-applet-facility.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-applet-facility.h 2009-06-10 01:19:02.000000000 +0200 @@ -217,6 +217,9 @@ void cairo_dock_pop_up_about_applet (GtkMenuItem *menu_item, CairoDockModuleInstance *pModuleInstance); +void cairo_dock_open_module_config_on_demand (int iClickedButton, GtkWidget *pInteractiveWidget, CairoDockModuleInstance *pModuleInstance, CairoDialog *pDialog); + + ////////////// /// CONFIG /// @@ -356,15 +359,31 @@ *@return Le chemin vers le repertoire du theme, dans une chaine nouvellement allouee. */ #define CD_CONFIG_GET_THEME_PATH(cGroupName, cKeyName, cThemeDirName, cDefaultThemeName) \ -cairo_dock_get_theme_path_for_module (pKeyFile, cGroupName, cKeyName, &bFlushConfFileNeeded, cDefaultThemeName, MY_APPLET_SHARE_DATA_DIR"/"cThemeDirName, MY_APPLET_USER_DATA_DIR) + __extension__ ({\ + gchar *_cThemePath = cairo_dock_get_theme_path_for_module (pKeyFile, cGroupName, cKeyName, &bFlushConfFileNeeded, cDefaultThemeName, MY_APPLET_SHARE_DATA_DIR"/"cThemeDirName, MY_APPLET_USER_DATA_DIR);\ + if (_cThemePath == NULL) {\ + const gchar *_cMessage = _("the theme couldn't be found; the default theme will be used instead.\n You can change this by opening the configuration of this module; do you want to do it now ?");\ + Icon *_pIcon = cairo_dock_get_dialogless_icon ();\ + gchar *_cQuestion = g_strdup_printf ("%s : %s", myApplet->pModule->pVisitCard->cModuleName, _cMessage);\ + cairo_dock_show_dialog_with_question (_cQuestion, _pIcon, CAIRO_CONTAINER (g_pMainDock), MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE, (CairoDockActionOnAnswerFunc) cairo_dock_open_module_config_on_demand, myApplet, NULL);\ + g_free (_cQuestion); }\ + _cThemePath; }) /** -*Recupere la valeur d'un theme de gauge, en mettant a jour la liste des jauges disponibles dans le fichier de conf. +*Recupere la valeur d'un theme de gauge, en cherchant parmi les themes distants si necessaire. *@param cGroupName nom du groupe (dans le fichier de conf) du parametre correspondant au theme. *@param cKeyName nom de la cle (dans le fichier de conf) du parametre correspondant au theme. */ #define CD_CONFIG_GET_GAUGE_THEME(cGroupName, cKeyName) \ -cairo_dock_get_gauge_key_value(CD_APPLET_MY_CONF_FILE, pKeyFile, cGroupName, cKeyName, &bFlushConfFileNeeded, "turbo-night-fuel") + __extension__ ({\ + gchar *_cThemePath = cairo_dock_get_gauge_key_value(CD_APPLET_MY_CONF_FILE, pKeyFile, cGroupName, cKeyName, &bFlushConfFileNeeded, "turbo-night-fuel");\ + if (_cThemePath == NULL) {\ + const gchar *_cMessage = _("the gauge theme couldn't be found; a default gauge will be used instead.\n You can change this by opening the configuration of this module; do you want to do it now ?");\ + Icon *_pIcon = cairo_dock_get_dialogless_icon ();\ + gchar *_cQuestion = g_strdup_printf ("%s : %s", myApplet->pModule->pVisitCard->cModuleName, _cMessage);\ + cairo_dock_show_dialog_with_question (_cQuestion, _pIcon, CAIRO_CONTAINER (g_pMainDock), MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE, (CairoDockActionOnAnswerFunc) cairo_dock_open_module_config_on_demand, myApplet, NULL);\ + g_free (_cQuestion); }\ + _cThemePath; }) //////////// @@ -375,28 +394,31 @@ *@param pMenu GtkWidget du menu auquel on rajoutera le sous-menu. *@return le sous-menu nouvellement cree et attache au menu. */ -#define CD_APPLET_ADD_SUB_MENU(cLabel, pMenu) \ +#define CD_APPLET_ADD_SUB_MENU_WITH_IMAGE(cLabel, pMenu, cImage) \ __extension__ ({\ GtkWidget *_pSubMenu = gtk_menu_new (); \ - pMenuItem = gtk_menu_item_new_with_label (cLabel); \ + if (cImage == NULL) {\ + pMenuItem = gtk_menu_item_new_with_label (cLabel); }\ + else {\ + gchar *__cImage = cImage;\ + pMenuItem = gtk_image_menu_item_new_with_label (cLabel);\ + if (*__cImage == '/') {\ + GdkPixbuf *_pixbuf = gdk_pixbuf_new_from_file_at_size (__cImage, 32, 32, NULL);\ + image = gtk_image_new_from_pixbuf (_pixbuf);\ + g_object_unref (_pixbuf); }\ + else {\ + image = gtk_image_new_from_stock (__cImage, GTK_ICON_SIZE_MENU); }\ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image); }\ gtk_menu_shell_append (GTK_MENU_SHELL (pMenu), pMenuItem); \ gtk_menu_item_set_submenu (GTK_MENU_ITEM (pMenuItem), _pSubMenu);\ _pSubMenu; }) +#define CD_APPLET_ADD_SUB_MENU(cLabel, pMenu) CD_APPLET_ADD_SUB_MENU_WITH_IMAGE(cLabel, pMenu, NULL) + /** Cree et ajoute un sous-menu par defaut au menu principal. Ce sous-menu est nomme suivant le nom de l'applet, et est represente par l'icone de l'applet. *@return le sous-menu nouvellement cree et attache au menu. */ -#define CD_APPLET_CREATE_MY_SUB_MENU(...) \ - __extension__ ({\ - pMenuItem = gtk_image_menu_item_new_with_label (myApplet->pModule->pVisitCard->cModuleName);\ - GdkPixbuf *_pixbuf = gdk_pixbuf_new_from_file_at_size (MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE, 32, 32, NULL);\ - image = gtk_image_new_from_pixbuf (_pixbuf);\ - g_object_unref (_pixbuf);\ - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image);\ - gtk_menu_shell_append (GTK_MENU_SHELL (CD_APPLET_MY_MENU), pMenuItem);\ - GtkWidget *_pSubMenu = gtk_menu_new ();\ - gtk_menu_item_set_submenu (GTK_MENU_ITEM (pMenuItem), _pSubMenu);\ - _pSubMenu; }) +#define CD_APPLET_CREATE_MY_SUB_MENU(...) CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (myApplet->pModule->pVisitCard->cModuleName, CD_APPLET_MY_MENU, MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE) /** Cree et ajoute un sous-menu a un menu deja existant. *@param cLabel nom du sous-menu, tel qu'il apparaitra dans le menu. @@ -426,7 +448,7 @@ /** *Ajoute une entree avec une icone GTK a un menu deja existant. *@param cLabel nom de l'entree, tel qu'il apparaitra dans le menu. -*@param gtkStock nom d'une icone de GTK. +*@param gtkStock nom d'une icone de GTK ou chemin complet d'une image quelconque. *@param pFunction fonction appelee lors de la selection de cette entree. *@param pMenu GtkWidget du menu auquel on rajoutera l'entree. *@param pData donnees passees en parametre de la fonction (doit contenir myApplet). @@ -875,6 +897,12 @@ #define CD_APPLET_MY_ICONS_LIST (myDock ? (myIcon->pSubDock ? myIcon->pSubDock->icons : NULL) : myDesklet->icons) #define CD_APPLET_MY_ICONS_LIST_CONTAINER (myDock ? CAIRO_CONTAINER (myIcon->pSubDock) : CAIRO_CONTAINER (myDesklet)) +//\_________________________________ TASKBAR +#define CD_APPLET_MANAGE_APPLICATION(cApplicationClass, bStealTaskBarIcon) do {\ + if (myIcon->cClass != NULL && ! bStealTaskBarIcon)\ + cairo_dock_deinhibate_class (cApplicationClass, myIcon);\ + else if (myIcon->cClass == NULL && bStealTaskBarIcon)\ + cairo_dock_inhibate_class (cApplicationClass, myIcon); } while (0) //\_________________________________ INTERNATIONNALISATION /** diff -Nru cairo-dock-2.0.3/src/cairo-dock-application-factory.c cairo-dock-2.0.5/src/cairo-dock-application-factory.c --- cairo-dock-2.0.3/src/cairo-dock-application-factory.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-application-factory.c 2009-06-10 01:19:04.000000000 +0200 @@ -607,7 +607,7 @@ } else if (iState == PropertyNewValue && aProperty == s_aNetWmIcon) { - //g_print ("%s change son icone\n", icon->acName); + g_print ("%s change son icone (%d)\n", icon->acName, cairo_dock_class_is_using_xicon (icon->cClass) || ! myTaskBar.bOverWriteXIcons); if (cairo_dock_class_is_using_xicon (icon->cClass) || ! myTaskBar.bOverWriteXIcons) { cairo_dock_reload_one_icon_buffer_in_dock (icon, pDock); @@ -667,7 +667,10 @@ } if (pDialog && myTaskBar.cForceDemandsAttention && icon->cClass && g_strstr_len (myTaskBar.cForceDemandsAttention, -1, icon->cClass)) { + g_print ("force above\n"); gtk_window_set_keep_above (GTK_WINDOW (pDialog->pWidget), TRUE); + Window Xid = GDK_WINDOW_XID (pDialog->pWidget->window); + cairo_dock_set_xwindow_type_hint (Xid, "_NET_WM_WINDOW_TYPE_DOCK"); // avec ca s'il passe pas devant les fenetres plein ecran on peut flinguer le WM. } } if (myTaskBar.cAnimationOnDemandsAttention) diff -Nru cairo-dock-2.0.3/src/cairo-dock-applications-manager.c cairo-dock-2.0.5/src/cairo-dock-applications-manager.c --- cairo-dock-2.0.3/src/cairo-dock-applications-manager.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-applications-manager.c 2009-06-10 01:19:04.000000000 +0200 @@ -139,7 +139,7 @@ if (icon->iLastCheckTime != -1) g_hash_table_remove (s_hXWindowTable, &icon->Xid); - cairo_dock_unregister_pid (icon); // on n'efface pas sa classe ici car on peut en avoir besoin encore. + //cairo_dock_unregister_pid (icon); // on n'efface pas sa classe ici car on peut en avoir besoin encore. if (icon->iBackingPixmap != 0) { @@ -188,7 +188,7 @@ } cairo_dock_free_icon_buffers (pIcon); // on ne veut pas passer dans le 'unregister' ni la gestion de la classe. - cairo_dock_unregister_pid (pIcon); + //cairo_dock_unregister_pid (pIcon); g_free (pIcon); return TRUE; } @@ -693,12 +693,18 @@ void cairo_dock_animate_icon_on_active (Icon *icon, CairoDock *pParentDock) { + g_return_if_fail (pParentDock != NULL); if (icon->fPersonnalScale == 0) // sinon on laisse l'animation actuelle. { - if (cairo_dock_animation_will_be_visible (pParentDock) && myTaskBar.cAnimationOnActiveWindow && ! pParentDock->bInside && icon->iAnimationState == CAIRO_DOCK_STATE_REST) + if (myTaskBar.cAnimationOnActiveWindow) { + if (cairo_dock_animation_will_be_visible (pParentDock) && ! pParentDock->bInside && icon->iAnimationState == CAIRO_DOCK_STATE_REST) cairo_dock_request_icon_animation (icon, pParentDock, myTaskBar.cAnimationOnActiveWindow, 1); } + else if (! pParentDock->bIsShrinkingDown) + { + cairo_dock_redraw_icon (icon, CAIRO_CONTAINER (pParentDock)); + } } } @@ -813,10 +819,7 @@ } else { - if (myTaskBar.cAnimationOnActiveWindow) - cairo_dock_animate_icon_on_active (icon, pParentDock); - else if (! pParentDock->bIsShrinkingDown) - cairo_dock_redraw_icon (icon, CAIRO_CONTAINER (pParentDock)); + cairo_dock_animate_icon_on_active (icon, pParentDock); } if (icon->bIsDemandingAttention) // on force ici, car il semble qu'on ne recoive pas toujours le retour a la normale. cairo_dock_appli_stops_demanding_attention (icon); @@ -986,7 +989,7 @@ } //if (! bChangeIntercepted) { - if (icon != NULL && icon->fPersonnalScale <= 0) // pour une icône en cours de supression, on ne fait rien. + if (icon != NULL && icon->fPersonnalScale <= 0) // pour une icone en cours de supression, on ne fait rien. { CairoDock *pParentDock = cairo_dock_search_dock_from_name (icon->cParentDockName); ///if (pParentDock == NULL) @@ -1255,12 +1258,17 @@ //cairo_dock_start_icon_animation (icon, pParentDock); cairo_dock_launch_animation (CAIRO_CONTAINER (pParentDock)); + + icon->iLastCheckTime = -1; // on va la desenregistrer tout de suite. + ///cairo_dock_unregister_appli (icon); + cairo_dock_remove_appli_from_class (icon); // elle reste une icone d'appli, et de la meme classe, mais devient invisible aux autres icones de sa classe. Inutile de tester les inhibiteurs, puisqu'elle est dans un dock. + bToBeRemoved = TRUE; } else { cd_message (" pas dans un container, on la detruit donc immediatement"); cairo_dock_update_name_on_inhibators (icon->cClass, *Xid, NULL); - icon->iLastCheckTime = -1; // pour ne pas la desenregistrer de la HashTable lors du 'free'. + icon->iLastCheckTime = -1; // pour ne pas la desenregistrer de la HashTable lors du 'free' puisqu'on est en train de parcourir la table. cairo_dock_free_icon (icon); bToBeRemoved = TRUE; /// redessiner les inhibiteurs... @@ -1312,7 +1320,7 @@ cairo_dock_update_dock_size (pParentDock); } } - else if (myTaskBar.bMixLauncherAppli) // on met l'indicateur sur le lanceur dans tous les cas. + else if (myTaskBar.bMixLauncherAppli) // on met tout de meme l'indicateur sur le lanceur. { cairo_dock_prevent_inhibated_class (icon); } diff -Nru cairo-dock-2.0.3/src/cairo-dock.c cairo-dock-2.0.5/src/cairo-dock.c --- cairo-dock-2.0.3/src/cairo-dock.c 2009-05-20 22:22:58.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock.c 2009-06-10 01:19:03.000000000 +0200 @@ -95,6 +95,7 @@ #include "cairo-dock-desklet.h" #include "cairo-dock-flying-container.h" #include "cairo-dock-animations.h" +#include "cairo-dock-gauge2.h" CairoDock *g_pMainDock; // pointeur sur le dock principal. int g_iWmHint = GDK_WINDOW_TYPE_HINT_DOCK; // hint pour la fenetre du dock principal. @@ -273,7 +274,7 @@ "force the dock to consider this environnement - it may crash the dock if not set properly.", NULL}, {"dir", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &cUserDefinedDataDir, - "force the dock to load this directory, instead of ~/.cairo-dock.", NULL}, + "force the dock to load this directory, instead of ~/.config/cairo-dock.", NULL}, {"maintenance", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &bMaintenance, "allow to edit the config before the dock is started and show the config panel on start", NULL}, @@ -513,6 +514,8 @@ g_bUseOpenGL = (g_pGlConfig != NULL); + cairo_dock_register_data_renderer_entry_point ("gauge", (CairoDataRendererNewFunc) cairo_dock_new_gauge); + //\___________________ On initialise le gestionnaire de modules et on pre-charge les modules existant. if (g_module_supported () && ! bSafeMode) { @@ -586,26 +589,15 @@ } cd_message ("loading theme ..."); - if (! g_file_test (g_cConfFile, G_FILE_TEST_EXISTS) || bSafeMode) + if (! g_file_test (g_cConfFile, G_FILE_TEST_EXISTS)) { - if (! bSafeMode) // le fichier de conf n'existe pas, on copie le theme par defaut dans current_theme. - { - gchar *cCommand = g_strdup_printf ("/bin/cp -r '%s'/* '%s/%s'", CAIRO_DOCK_SHARE_DATA_DIR"/themes/_default_", g_cCairoDockDataDir, CAIRO_DOCK_CURRENT_THEME_NAME); - cd_message (cCommand); - r = system (cCommand); - g_free (cCommand); - - cairo_dock_mark_theme_as_modified (FALSE); // on ne proposera pas de sauvegarder ce theme. - cairo_dock_load_current_theme (); - } - else // on propose de choisir un theme. - { - do - { - cairo_dock_manage_themes (NULL, CAIRO_DOCK_START_SAFE); - } - while (g_pMainDock == NULL); - } + gchar *cCommand = g_strdup_printf ("/bin/cp -r '%s'/* '%s/%s'", CAIRO_DOCK_SHARE_DATA_DIR"/themes/_default_", g_cCairoDockDataDir, CAIRO_DOCK_CURRENT_THEME_NAME); + cd_message (cCommand); + r = system (cCommand); + g_free (cCommand); + + cairo_dock_mark_theme_as_modified (FALSE); // on ne proposera pas de sauvegarder ce theme. + cairo_dock_load_current_theme (); } else cairo_dock_load_current_theme (); @@ -675,7 +667,7 @@ } if (! bTesting) - g_timeout_add_seconds (4, _cairo_dock_successful_launch, NULL); + g_timeout_add_seconds (5, _cairo_dock_successful_launch, NULL); gtk_main (); diff -Nru cairo-dock-2.0.3/src/cairo-dock-callbacks.c cairo-dock-2.0.5/src/cairo-dock-callbacks.c --- cairo-dock-2.0.3/src/cairo-dock-callbacks.c 2009-05-23 01:13:52.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-callbacks.c 2009-06-10 01:19:02.000000000 +0200 @@ -78,10 +78,7 @@ extern cairo_surface_t *g_pBackgroundSurfaceFull[2]; extern gboolean g_bEasterEggs; - extern gboolean g_bUseOpenGL; - -extern gboolean g_bDisplayDropEmblem; extern gboolean g_bLocked; static gboolean s_bHideAfterShortcut = FALSE; @@ -121,7 +118,11 @@ if (pExpose->area.x + pExpose->area.y != 0) { glEnable (GL_SCISSOR_TEST); // ou comment diviser par 4 l'occupation CPU ! - glScissor ((int) pExpose->area.x, (int) pExpose->area.y, (int) pExpose->area.width, (int) pExpose->area.height); + glScissor ((int) pExpose->area.x, + (int) (pDock->bHorizontalDock ? pDock->iCurrentHeight : pDock->iCurrentWidth) - + pExpose->area.y - pExpose->area.height, // lower left corner of the scissor box. + (int) pExpose->area.width, + (int) pExpose->area.height); } if (cairo_dock_is_loading ()) @@ -181,17 +182,6 @@ cairo_dock_notify (CAIRO_DOCK_RENDER_DOCK, pDock, pCairoContext); } - //Indicateur de drop, j'ai rajouter le support des surfaces en cache, du coup on ne perd de ressources qu'au dessin. - if (pDock->bIsDragging && g_bDisplayDropEmblem) - { - Icon *pPointedIcon = cairo_dock_get_pointed_icon (pDock->icons); - if (pPointedIcon != NULL && pPointedIcon->iAnimationState != CAIRO_DOCK_STATE_AVOID_MOUSE) - { - cairo_translate (pCairoContext, pPointedIcon->fDrawX, pPointedIcon->fDrawY); - cairo_dock_draw_emblem_classic (pCairoContext, pPointedIcon, CAIRO_CONTAINER (pDock), CAIRO_DOCK_EMBLEM_DROP_INDICATOR, CAIRO_DOCK_EMBLEM_UPPER_RIGHT, FALSE); - } - } - cairo_destroy (pCairoContext); #ifdef HAVE_GLITZ @@ -368,6 +358,8 @@ if (myAccessibility.iShowSubDockDelay > 0) { //pDock->iMouseX = iX; + if (s_iSidShowSubDockDemand != 0) + g_source_remove (s_iSidShowSubDockDemand); s_iSidShowSubDockDemand = g_timeout_add (myAccessibility.iShowSubDockDelay, (GSourceFunc) _cairo_dock_show_sub_dock_delayed, pDock); s_pDockShowingSubDock = pDock; //cd_debug ("s_iSidShowSubDockDemand <- %d\n", s_iSidShowSubDockDemand); @@ -922,7 +914,7 @@ pDock->fDecorationsOffsetX = 0; if (pDock->iRefCount != 0) { - gtk_window_present (GTK_WINDOW (pWidget)); + gtk_window_present (GTK_WINDOW (pWidget)); /// utile ??? } pDock->bInside = TRUE; @@ -997,6 +989,10 @@ pDock->bAtBottom = FALSE; } + Icon *icon = cairo_dock_get_pointed_icon (pDock->icons); + if (icon != NULL) + icon->bPointed = FALSE; // sinon on ne detecte pas l'arrive sur l'icone, c'est genant si elle a un sous-dock. + cairo_dock_start_growing (pDock); return FALSE; @@ -1014,7 +1010,8 @@ } else if (pKey->type == GDK_KEY_RELEASE) { - if (pKey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) // On relache la touche ALT, typiquement apres avoir fait un ALT + clique gauche + deplacement. + g_print ("release : pKey->keyval = %d\n", pKey->keyval); + if ((pKey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) && pKey->keyval == 0) // On relache la touche ALT, typiquement apres avoir fait un ALT + clique gauche + deplacement. { if (pDock->iRefCount == 0) cairo_dock_write_root_dock_gaps (pDock); @@ -1051,7 +1048,7 @@ cBGCommand = cCommand; if (cWorkingDirectory != NULL) { - cCommand = g_strdup_printf ("cd %s && %s", cWorkingDirectory, cBGCommand); + cCommand = g_strdup_printf ("cd '%s' && %s", cWorkingDirectory, cBGCommand); g_free (cBGCommand); cBGCommand = cCommand; } @@ -1204,9 +1201,9 @@ else if (CAIRO_DOCK_IS_LAUNCHER (icon)) { cd_debug (" launcher"); - if (icon->pSubDock != NULL && icon->pSubDock->icons != NULL && icon->cClass != NULL && ! (iButtonState & GDK_SHIFT_MASK)) // un lanceur ayant un sous-dock de classe ou une icone de paille : on cache ou on montre. + if (CAIRO_DOCK_IS_MULTI_APPLI (icon) && ! (iButtonState & GDK_SHIFT_MASK)) // un lanceur ayant un sous-dock de classe ou une icone de paille : on cache ou on montre. { - if (myAccessibility.bShowSubDockOnClick) + if (! myAccessibility.bShowSubDockOnClick) { _cairo_dock_hide_show_in_class_subdock (icon); } @@ -1250,7 +1247,7 @@ cairo_dock_fm_launch_uri (icon->acCommand); return CAIRO_DOCK_INTERCEPT_NOTIFICATION; } - if (CAIRO_DOCK_IS_LAUNCHER (icon) && icon->pSubDock != NULL && icon->pSubDock->icons != NULL &&icon->cClass != NULL) + if (CAIRO_DOCK_IS_MULTI_APPLI (icon)) { // On ferme tout. _cairo_dock_close_all_in_class_subdock (icon); @@ -1425,6 +1422,20 @@ } +gboolean cairo_dock_notification_scroll_icon (gpointer pUserData, Icon *icon, CairoDock *pDock, int iDirection) +{ + if (CAIRO_DOCK_IS_LAUNCHER (icon) && icon->pSubDock != NULL && icon->pSubDock->icons != NULL && icon->cClass != NULL) // on emule un alt+tab sur la liste des applis du sous-dock. + { + _cairo_dock_show_prev_next_in_class_subdock (icon, iDirection == GDK_SCROLL_DOWN); + } + else if (CAIRO_DOCK_IS_APPLI (icon) && icon->cClass != NULL) + { + Icon *pNextIcon = cairo_dock_get_prev_next_classmate_icon (icon, iDirection == GDK_SCROLL_DOWN); + if (pNextIcon != NULL) + cairo_dock_show_xwindow (pNextIcon->Xid); + } + return CAIRO_DOCK_LET_PASS_NOTIFICATION; +} gboolean cairo_dock_on_scroll (GtkWidget* pWidget, GdkEventScroll* pScroll, CairoDock *pDock) { if (pScroll->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) @@ -1457,18 +1468,7 @@ Icon *icon = cairo_dock_get_pointed_icon (pDock->icons); if (icon != NULL) { - if (CAIRO_DOCK_IS_LAUNCHER (icon) && icon->pSubDock != NULL && icon->pSubDock->icons != NULL && icon->cClass != NULL) // on emule un alt+tab sur la liste des applis du sous-dock. - { - _cairo_dock_show_prev_next_in_class_subdock (icon, pScroll->direction == GDK_SCROLL_DOWN); - } - else if (CAIRO_DOCK_IS_APPLI (icon) && icon->cClass != NULL) - { - Icon *pNextIcon = cairo_dock_get_prev_next_classmate_icon (icon, pScroll->direction == GDK_SCROLL_DOWN); - if (pNextIcon != NULL) - cairo_dock_show_xwindow (pNextIcon->Xid); - } cairo_dock_notify (CAIRO_DOCK_SCROLL_ICON, icon, pDock, pScroll->direction); - } return FALSE; @@ -1757,7 +1757,7 @@ } -gboolean cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, CairoDock *pDock) +/*gboolean cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, CairoDock *pDock) { Icon *pIcon = NULL; if (CAIRO_DOCK_IS_DOCK (pDock)) @@ -1774,7 +1774,7 @@ if (answer == GTK_RESPONSE_YES) gtk_main_quit (); return FALSE; -} +}*/ void cairo_dock_show_dock_at_mouse (CairoDock *pDock) diff -Nru cairo-dock-2.0.3/src/cairo-dock-callbacks.h cairo-dock-2.0.5/src/cairo-dock-callbacks.h --- cairo-dock-2.0.3/src/cairo-dock-callbacks.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-callbacks.h 2009-06-10 01:18:59.000000000 +0200 @@ -64,7 +64,7 @@ void cairo_dock_on_drag_leave (GtkWidget *pWidget, GdkDragContext *dc, guint time, CairoDock *pDock); -gboolean cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, CairoDock *pDock); +//gboolean cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, CairoDock *pDock); void cairo_dock_show_dock_at_mouse (CairoDock *pDock); diff -Nru cairo-dock-2.0.3/src/cairo-dock-class-manager.c cairo-dock-2.0.5/src/cairo-dock-class-manager.c --- cairo-dock-2.0.3/src/cairo-dock-class-manager.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-class-manager.c 2009-06-10 01:19:04.000000000 +0200 @@ -337,12 +337,9 @@ { pInhibatorIcon->Xid = pIcon->Xid; pInhibatorIcon->bIsHidden = pIcon->bIsHidden; - ///if (CAIRO_DOCK_IS_NORMAL_LAUNCHER (pInhibatorIcon)) // pas d'indicateur pour les applets, elles ont deja leurs propres moyens pour signaler de l'information a l'utilisateur. - { - cd_message (">>> %s prendra un indicateur au prochain redraw ! (Xid : %d)", pInhibatorIcon->acName, pInhibatorIcon->Xid); - pInhibatorIcon->bHasIndicator = TRUE; - _cairo_dock_set_same_indicator_on_sub_dock (pInhibatorIcon); - } + cd_message (">>> %s prendra un indicateur au prochain redraw ! (Xid : %d)", pInhibatorIcon->acName, pInhibatorIcon->Xid); + pInhibatorIcon->bHasIndicator = TRUE; + _cairo_dock_set_same_indicator_on_sub_dock (pInhibatorIcon); } if (pInhibatorIcon->Xid == pIcon->Xid) // cette icone nous controle. @@ -476,7 +473,7 @@ for (ic = pList; ic != NULL; ic = ic->next) { pOneIcon = ic->data; - if (pOneIcon != NULL && pOneIcon->fPersonnalScale == 0 && pOneIcon->Xid != Xid) // la 2eme condition est a priori toujours vraie. + if (pOneIcon != NULL && pOneIcon->fPersonnalScale <= 0 && pOneIcon->Xid != Xid) // la 2eme condition est a priori toujours vraie. { pSameClassIcon = pOneIcon; break ; @@ -761,7 +758,7 @@ CairoDock *pFakeParentDock = NULL; Icon *pFakeClassIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pFakeParentDock); g_return_val_if_fail (pFakeClassIcon != NULL, TRUE); - if (CAIRO_DOCK_IS_NORMAL_LAUNCHER (pFakeClassIcon) || CAIRO_DOCK_IS_APPLET (pFakeClassIcon)) + if (CAIRO_DOCK_IS_NORMAL_LAUNCHER (pFakeClassIcon) || CAIRO_DOCK_IS_APPLET (pFakeClassIcon)) // le sous-dock est pointe par un inhibiteur. { cairo_dock_detach_icon_from_dock (pLastClassIcon, pDock, FALSE); g_free (pLastClassIcon->cParentDockName); @@ -770,9 +767,11 @@ cairo_dock_destroy_dock (pDock, cClass, NULL, NULL); pFakeClassIcon->pSubDock = NULL; cd_debug ("sanity check : pFakeClassIcon->Xid : %d", pFakeClassIcon->Xid); - cairo_dock_insert_appli_in_dock (pLastClassIcon, g_pMainDock, ! CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON); + cairo_dock_insert_appli_in_dock (pLastClassIcon, g_pMainDock, ! CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON); // a priori inutile. + cairo_dock_update_name_on_inhibators (cClass, pLastClassIcon->Xid, pLastClassIcon->acName); + cairo_dock_redraw_icon (pFakeClassIcon, CAIRO_CONTAINER (g_pMainDock)); } - else // le sous-dock est donc pointe par un inhibiteur. + else // le sous-dock est donc pointe par une icone de paille. { cd_debug ("trouve l'icone en papier (%x;%x)", pFakeClassIcon, pFakeParentDock); cairo_dock_detach_icon_from_dock (pLastClassIcon, pDock, FALSE); @@ -786,10 +785,19 @@ cd_debug (" et l'icone de paille"); cairo_dock_remove_icon_from_dock (pFakeParentDock, pFakeClassIcon); + pLastClassIcon->fScale = pFakeClassIcon->fScale; + pLastClassIcon->fDrawX = pFakeClassIcon->fDrawX; + pLastClassIcon->fDrawY = pFakeClassIcon->fDrawY; + pLastClassIcon->fAlpha = pFakeClassIcon->fAlpha; + pLastClassIcon->fWidth = pFakeClassIcon->fWidth; + pLastClassIcon->fHeight = pFakeClassIcon->fHeight; + //pLastClassIcon-> = pFakeClassIcon->; cairo_dock_free_icon (pFakeClassIcon); cd_debug (" puis on re-insere l'appli restante"); cairo_dock_insert_icon_in_dock_full (pLastClassIcon, pFakeParentDock, CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON, ! CAIRO_DOCK_INSERT_SEPARATOR, NULL); + //pFakeParentDock->calculate_icons (pFakeParentDock); + cairo_dock_redraw_icon (pLastClassIcon, CAIRO_CONTAINER (pFakeParentDock)); // on suppose que les tailles des 2 icones sont identiques. } return TRUE; diff -Nru cairo-dock-2.0.3/src/cairo-dock-class-manager.h cairo-dock-2.0.5/src/cairo-dock-class-manager.h --- cairo-dock-2.0.3/src/cairo-dock-class-manager.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-class-manager.h 2009-06-10 01:19:12.000000000 +0200 @@ -8,10 +8,20 @@ G_BEGIN_DECLS /** -*@file cairo-dock-animations.h This class handles the managment of the applications classes. +*@file cairo-dock-class-manager.h This class handles the managment of the applications classes. * Classes are used to group the windows of a same program, and to bind a launcher to the launched application. */ +struct _CairoDockClassAppli { + /// TRUE ssi l'appli doit utiliser l'icone fournie par X au lieu de celle du theme. + gboolean bUseXIcon; + /// TRUE ssi l'appli ne se groupe pas par classe. + gboolean bExpand; + /// Liste des inhibiteurs de la classe. + GList *pIconsOfClass; + /// Liste des icones d'appli de cette classe. + GList *pAppliOfClass; +}; /** * Initialise le gestionnaire de classes. Ne fait rien la 2eme fois. diff -Nru cairo-dock-2.0.3/src/cairo-dock-container.c cairo-dock-2.0.5/src/cairo-dock-container.c --- cairo-dock-2.0.3/src/cairo-dock-container.c 2009-05-23 00:57:50.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-container.c 2009-06-10 01:19:03.000000000 +0200 @@ -71,6 +71,11 @@ gdk_gl_drawable_gl_end (pGlDrawable); } +static gboolean _cairo_dock_on_delete (GtkWidget *pWidget, GdkEvent *event, gpointer data) +{ + return TRUE; // on empeche les ALT+F4 malheureux. +} + GtkWidget *cairo_dock_create_container_window (void) { GtkWidget* pWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -95,6 +100,11 @@ NULL); } + g_signal_connect (G_OBJECT (pWindow), + "delete-event", + G_CALLBACK (_cairo_dock_on_delete), + NULL); + gtk_widget_set_app_paintable (pWindow, TRUE); gtk_window_set_decorated (GTK_WINDOW (pWindow), FALSE); gtk_window_set_resizable (GTK_WINDOW (pWindow), TRUE); diff -Nru cairo-dock-2.0.3/src/cairo-dock-container.h cairo-dock-2.0.5/src/cairo-dock-container.h --- cairo-dock-2.0.3/src/cairo-dock-container.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-container.h 2009-06-10 01:19:12.000000000 +0200 @@ -7,6 +7,57 @@ #include "cairo-dock-struct.h" G_BEGIN_DECLS + +/** +*@file cairo-dock-container.h This class defines the basis of containers, that are classic or hardware accelerated animated windows. +* A container is a rectangular located surface, has the notion of orientation, can hold external datas, monitors the mouse position, and has its own animation loop. +* Docks, Desklets, Dialogs, and Flying-containers all derive from Containers. +*/ + +struct _CairoContainer { + /// type de container. + CairoDockTypeContainer iType; + /// La fenetre du widget. + GtkWidget *pWidget; + /// Taille de la fenetre. + gint iWidth, iHeight; + /// Position de la fenetre. + gint iWindowPositionX, iWindowPositionY; + /// Vrai ssi le pointeur est dans le container (widgets fils inclus). + gboolean bInside; + /// TRUE ssi le container est horizontal. + CairoDockTypeHorizontality bIsHorizontal; + /// TRUE ssi le container est oriente vers le haut. + gboolean bDirectionUp; +#ifdef HAVE_GLITZ + glitz_drawable_format_t *pDrawFormat; + glitz_drawable_t* pGlitzDrawable; + glitz_format_t* pGlitzFormat; +#else + gpointer padding[3]; +#endif + /// Donnees exterieures. + gpointer pDataSlot[CAIRO_DOCK_NB_DATA_SLOT]; + /// pour l'animation du container. + gint iSidGLAnimation; + /// intervalle de temps entre 2 etapes de l'animation. + gint iAnimationDeltaT; + /// derniere position en X du curseur dans le referentiel du container. + gint iMouseX; + /// derniere position en Y du curseur dans le referentiel du container. + gint iMouseY; + /// zoom applique aux icones du container. + gdouble fRatio; + /// TRUE ssi le container est reflechissant. + gboolean bUseReflect; + /// contexte OpenGL associe a la fenetre. + GLXContext glContext; + /// TRUE <=> une animation lente est en cours. + gboolean bKeepSlowAnimation; +}; + +#define CAIRO_CONTAINER(p) ((CairoContainer *) (p)) + ////////////// /// WINDOW /// ////////////// diff -Nru cairo-dock-2.0.3/src/cairo-dock-data-renderer.c cairo-dock-2.0.5/src/cairo-dock-data-renderer.c --- cairo-dock-2.0.3/src/cairo-dock-data-renderer.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-data-renderer.c 2009-06-10 01:19:04.000000000 +0200 @@ -39,7 +39,7 @@ void cairo_dock_init_data_renderer (CairoDataRenderer *pRenderer, cairo_t *pSourceContext, CairoContainer *pContainer, CairoDataRendererAttribute *pAttribute) { //\_______________ On alloue la structure des donnees. - pRenderer->data.iNbValues = pAttribute->iNbValues; + pRenderer->data.iNbValues = MAX (1, pAttribute->iNbValues); pRenderer->data.iMemorySize = MAX (2, pAttribute->iMemorySize); // au moins la derniere valeur et la nouvelle. pRenderer->data.pValuesBuffer = g_new0 (gdouble, pRenderer->data.iNbValues * pRenderer->data.iMemorySize); pRenderer->data.pTabValues = g_new (gdouble *, pRenderer->data.iMemorySize); @@ -99,16 +99,20 @@ if (pRenderer == NULL) return CAIRO_DOCK_LET_PASS_NOTIFICATION; - pRenderer->iSmoothAnimationStep ++; - int iDeltaT = cairo_dock_get_slow_animation_delta_t (pContainer); - int iNbIterations = pRenderer->iLatencyTime / iDeltaT; - if (pRenderer->iSmoothAnimationStep < iNbIterations) + if (pRenderer->iSmoothAnimationStep > 0) { - pRenderer->fLatency = 1. * (iNbIterations - pRenderer->iSmoothAnimationStep) / iNbIterations; + pRenderer->iSmoothAnimationStep --; + int iDeltaT = cairo_dock_get_slow_animation_delta_t (pContainer); + int iNbIterations = pRenderer->iLatencyTime / iDeltaT; + + pRenderer->fLatency = (double) pRenderer->iSmoothAnimationStep / iNbIterations; _cairo_dock_draw_icon_texture_opengl (pRenderer, pIcon, pContainer); + cairo_dock_redraw_icon (pIcon, pContainer); + + if (pRenderer->iSmoothAnimationStep < iNbIterations) + *bContinueAnimation = TRUE; } - *bContinueAnimation = TRUE; return CAIRO_DOCK_LET_PASS_NOTIFICATION; } @@ -126,7 +130,10 @@ if (CAIRO_DOCK_CONTAINER_IS_OPENGL (pContainer) && pRenderer->interface.render_opengl) { - cairo_dock_register_notification_on_icon (pIcon, CAIRO_DOCK_UPDATE_ICON_SLOW, + /*cairo_dock_register_notification_on_icon (pIcon, CAIRO_DOCK_UPDATE_ICON_SLOW, + (CairoDockNotificationFunc) cairo_dock_update_icon_data_renderer_notification, + CAIRO_DOCK_RUN_AFTER, NULL);*/ + cairo_dock_register_notification (CAIRO_DOCK_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) cairo_dock_update_icon_data_renderer_notification, CAIRO_DOCK_RUN_AFTER, NULL); } @@ -150,8 +157,8 @@ //\___________________ On met a jour les valeurs du renderer. CairoDataToRenderer *pData = cairo_data_renderer_get_data (pRenderer); pData->iCurrentIndex ++; - if (pData->iCurrentIndex >= pData->iNbValues) - pData->iCurrentIndex -= pData->iNbValues; + if (pData->iCurrentIndex >= pData->iMemorySize) + pData->iCurrentIndex -= pData->iMemorySize; double fNewValue; int i; @@ -171,14 +178,18 @@ //\___________________ On met a jour le dessin de l'icone. if (CAIRO_DOCK_CONTAINER_IS_OPENGL (pContainer)&& pRenderer->interface.render_opengl) { - pRenderer->fLatency = 0; - _cairo_dock_draw_icon_texture_opengl (pRenderer, pIcon, pContainer); - if (pRenderer->iLatencyTime > 0) { - pRenderer->iSmoothAnimationStep = 0; + int iDeltaT = cairo_dock_get_slow_animation_delta_t (pContainer); + int iNbIterations = pRenderer->iLatencyTime / iDeltaT; + pRenderer->iSmoothAnimationStep = iNbIterations; cairo_dock_launch_animation (pContainer); } + else + { + pRenderer->fLatency = 0; + _cairo_dock_draw_icon_texture_opengl (pRenderer, pIcon, pContainer); + } } else { @@ -276,11 +287,20 @@ void cairo_dock_reload_data_renderer_on_icon (Icon *pIcon, CairoContainer *pContainer, cairo_t *pSourceContext, CairoDataRendererAttribute *pAttribute) { - CairoDataToRenderer *pData = NULL; //\_____________ On recupere les donnees de l'actuel renderer. + CairoDataToRenderer *pData = NULL; CairoDataRenderer *pOldRenderer = cairo_dock_get_icon_data_renderer (pIcon); - if (pOldRenderer != NULL) + g_return_if_fail (pOldRenderer != NULL || pAttribute != NULL); + + if (pAttribute == NULL) // rien ne change dans les parametres du data-renderer, on se contente de le recharger a la taille de l'icone. { + g_return_if_fail (pOldRenderer->interface.reload != NULL); + cairo_dock_get_icon_extent (pIcon, pContainer, &pOldRenderer->iWidth, &pOldRenderer->iHeight); + pOldRenderer->interface.reload (pOldRenderer, pSourceContext); + } + else // on recree le data-renderer avec les nouveaux attributs. + { + //\_____________ On recupere les donnees courantes. if (pOldRenderer->data.iNbValues == pAttribute->iNbValues) { pData = g_memdup (&pOldRenderer->data, sizeof (CairoDataToRenderer)); @@ -301,24 +321,17 @@ } } } - } - - //\_____________ On en cree un nouveau. - CairoDataRenderer *pNewRenderer; - if (pAttribute->cModelName == NULL && pOldRenderer != NULL) - { - pNewRenderer = pOldRenderer->interface.new (); - cairo_dock_add_data_renderer_on_icon (pNewRenderer, pIcon, pContainer, pSourceContext, pAttribute); - } - else - { + + //\_____________ On supprime l'ancien. + cairo_dock_remove_data_renderer_on_icon (pIcon); + + //\_____________ On en cree un nouveau. cairo_dock_add_new_data_renderer_on_icon (pIcon, pContainer, pSourceContext, pAttribute); + + //\_____________ On lui remet les valeurs actuelles. + CairoDataRenderer *pNewRenderer = cairo_dock_get_icon_data_renderer (pIcon); + if (pNewRenderer != NULL && pData != NULL) + memcpy (&pNewRenderer->data, pData, sizeof (CairoDataToRenderer)); + g_free (pData); } - cairo_dock_free_data_renderer (pOldRenderer); - - //\_____________ On lui remet les valeurs actuelles. - pNewRenderer = cairo_dock_get_icon_data_renderer (pIcon); - if (pNewRenderer != NULL && pData != NULL) - memcpy (&pNewRenderer->data, pData, sizeof (CairoDataToRenderer)); - g_free (pData); } diff -Nru cairo-dock-2.0.3/src/cairo-dock-data-renderer.h cairo-dock-2.0.5/src/cairo-dock-data-renderer.h --- cairo-dock-2.0.3/src/cairo-dock-data-renderer.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-data-renderer.h 2009-06-10 01:19:12.000000000 +0200 @@ -45,14 +45,14 @@ typedef void (*CairoDataRendererLoadFunc) (CairoDataRenderer *pDataRenderer, cairo_t *pSourceContext, CairoContainer *pContainer, CairoDataRendererAttribute *pAttribute); typedef void (*CairoDataRendererRenderFunc) (CairoDataRenderer *pDataRenderer, cairo_t *pCairoContext); typedef void (*CairoDataRendererRenderOpenGLFunc) (CairoDataRenderer *pDataRenderer); -typedef void (*CairoDataRendererResizeFunc) (CairoDataRenderer *pDataRenderer, int iWidth, int iHeight, CairoContainer *pContainer); +typedef void (*CairoDataRendererReloadFunc) (CairoDataRenderer *pDataRenderer, cairo_t *pSourceContext); typedef void (*CairoDataRendererFreeFunc) (CairoDataRenderer *pDataRenderer); struct _CairoDataRendererInterface { CairoDataRendererNewFunc new; CairoDataRendererLoadFunc load; CairoDataRendererRenderFunc render; CairoDataRendererRenderOpenGLFunc render_opengl; - CairoDataRendererResizeFunc resize; + CairoDataRendererReloadFunc reload; CairoDataRendererFreeFunc free; }; @@ -121,11 +121,11 @@ /// /**Get the elementary part of a Data Renderer *@param r a high level data renderer -*@return a CairoDataRenderer*/ +*@return a CairoDataRenderer* */ #define CAIRO_DATA_RENDERER(r) (&(r)->dataRenderer) /**Get the data of a Data Renderer *@param pRenderer a data renderer -*@return a CairoDataToRenderer*/ +*@return a CairoDataToRenderer* */ #define cairo_data_renderer_get_data(pRenderer) (&(pRenderer)->data); /*#define cairo_data_renderer_set_attribute(pRendererAttribute, cAttributeName, ) g_datalist_get_data (pRendererAttribute->pExtraProperties) diff -Nru cairo-dock-2.0.3/src/cairo-dock-default-view.c cairo-dock-2.0.5/src/cairo-dock-default-view.c --- cairo-dock-2.0.3/src/cairo-dock-default-view.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-default-view.c 2009-06-10 01:19:05.000000000 +0200 @@ -37,7 +37,7 @@ extern gint g_iScreenWidth[2]; extern int g_iScreenOffsetX, g_iScreenOffsetY; -extern int g_iBackgroundTexture; +extern GLuint g_iBackgroundTexture; extern gboolean g_bEasterEggs; diff -Nru cairo-dock-2.0.3/src/cairo-dock-desklet.c cairo-dock-2.0.5/src/cairo-dock-desklet.c --- cairo-dock-2.0.3/src/cairo-dock-desklet.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-desklet.c 2009-06-10 01:19:12.000000000 +0200 @@ -69,9 +69,9 @@ static cairo_surface_t *s_pRotateButtonSurface = NULL; static cairo_surface_t *s_pRetachButtonSurface = NULL; static cairo_surface_t *s_pDepthRotateButtonSurface = NULL; -static GLuint iRotateButtonTexture = 0; -static GLuint iRetachButtonTexture = 0; -static GLuint iDepthRotateButtonTexture = 0; +static GLuint s_iRotateButtonTexture = 0; +static GLuint s_iRetachButtonTexture = 0; +static GLuint s_iDepthRotateButtonTexture = 0; void cairo_dock_load_desklet_buttons (cairo_t *pSourceContext) { @@ -131,42 +131,49 @@ cairo_dock_load_desklet_buttons_texture (); } + void cairo_dock_load_desklet_buttons_texture (void) { cd_message ("%s (%x;%x)", __func__, s_pRotateButtonSurface, s_pRetachButtonSurface); if (! g_bUseOpenGL) return ; - if (iRotateButtonTexture != 0) + cairo_dock_unload_desklet_buttons_texture (); + + if (s_pRotateButtonSurface != NULL) { - glDeleteTextures (1, &iRotateButtonTexture); - iRotateButtonTexture = 0; + s_iRotateButtonTexture = cairo_dock_create_texture_from_surface (s_pRotateButtonSurface); } - if (iRetachButtonTexture != 0) + if (s_pRetachButtonSurface != NULL) { - glDeleteTextures (1, &iRetachButtonTexture); - iRetachButtonTexture = 0; + s_iRetachButtonTexture = cairo_dock_create_texture_from_surface (s_pRetachButtonSurface); } - if (iDepthRotateButtonTexture != 0) + if (s_pDepthRotateButtonSurface != NULL) { - glDeleteTextures (1, &iDepthRotateButtonTexture); - iDepthRotateButtonTexture = 0; + s_iDepthRotateButtonTexture = cairo_dock_create_texture_from_surface (s_pDepthRotateButtonSurface); } +} - if (s_pRotateButtonSurface != NULL) +void cairo_dock_unload_desklet_buttons_texture (void) +{ + if (s_iRotateButtonTexture != 0) { - iRotateButtonTexture = cairo_dock_create_texture_from_surface (s_pRotateButtonSurface); + _cairo_dock_delete_texture (s_iRotateButtonTexture); + s_iRotateButtonTexture = 0; } - if (s_pRetachButtonSurface != NULL) + if (s_iRetachButtonTexture != 0) { - iRetachButtonTexture = cairo_dock_create_texture_from_surface (s_pRetachButtonSurface); + _cairo_dock_delete_texture (s_iRetachButtonTexture); + s_iRetachButtonTexture = 0; } - if (s_pDepthRotateButtonSurface != NULL) + if (s_iDepthRotateButtonTexture != 0) { - iDepthRotateButtonTexture = cairo_dock_create_texture_from_surface (s_pDepthRotateButtonSurface); + _cairo_dock_delete_texture (s_iDepthRotateButtonTexture); + s_iDepthRotateButtonTexture = 0; } } + static void _cairo_dock_render_desklet (CairoDesklet *pDesklet, GdkRectangle *area) { gint w = 0, h = 0; @@ -390,31 +397,31 @@ if ((pDesklet->bInside || pDesklet->rotating || pDesklet->rotatingY || pDesklet->rotatingX) && ! pDesklet->bPositionLocked && ! pDesklet->bFixedAttitude) { _cairo_dock_set_alpha (1.); - if (iRotateButtonTexture != 0) + if (s_iRotateButtonTexture != 0) { glPushMatrix (); glTranslatef (-pDesklet->iWidth/2 + myDesklets.iDeskletButtonSize/2, pDesklet->iHeight/2 - myDesklets.iDeskletButtonSize/2, 0.); - _cairo_dock_apply_texture_at_size (iRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); + _cairo_dock_apply_texture_at_size (s_iRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); glPopMatrix (); } - if (iRetachButtonTexture != 0) + if (s_iRetachButtonTexture != 0) { glPushMatrix (); glTranslatef (pDesklet->iWidth/2 - myDesklets.iDeskletButtonSize/2, pDesklet->iHeight/2 - myDesklets.iDeskletButtonSize/2, 0.); - _cairo_dock_apply_texture_at_size (iRetachButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); + _cairo_dock_apply_texture_at_size (s_iRetachButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); glPopMatrix (); } - if (iDepthRotateButtonTexture != 0) + if (s_iDepthRotateButtonTexture != 0) { glPushMatrix (); glTranslatef (0., pDesklet->iHeight/2 - myDesklets.iDeskletButtonSize/2, 0.); - _cairo_dock_apply_texture_at_size (iDepthRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); + _cairo_dock_apply_texture_at_size (s_iDepthRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); glPopMatrix (); glPushMatrix (); @@ -422,7 +429,7 @@ glTranslatef (0., pDesklet->iWidth/2 - myDesklets.iDeskletButtonSize/2, 0.); - _cairo_dock_apply_texture_at_size (iDepthRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); + _cairo_dock_apply_texture_at_size (s_iDepthRotateButtonTexture, myDesklets.iDeskletButtonSize, myDesklets.iDeskletButtonSize); glPopMatrix (); } } @@ -954,7 +961,7 @@ return FALSE; } -gboolean on_delete_desklet (GtkWidget *pWidget, GdkEvent *event, CairoDesklet *pDesklet) +/*gboolean on_delete_desklet (GtkWidget *pWidget, GdkEvent *event, CairoDesklet *pDesklet) { if (pDesklet->pIcon->pModuleInstance != NULL) { @@ -965,7 +972,7 @@ cairo_dock_reload_module_instance (pDesklet->pIcon->pModuleInstance, TRUE); } return TRUE; -} +}*/ CairoDesklet *cairo_dock_create_desklet (Icon *pIcon, GtkWidget *pInteractiveWidget, CairoDeskletAccessibility iAccessibility) @@ -1028,10 +1035,10 @@ "leave-notify-event", G_CALLBACK (on_leave_desklet), pDesklet); - g_signal_connect (G_OBJECT (pWindow), + /*g_signal_connect (G_OBJECT (pWindow), "delete-event", G_CALLBACK (on_delete_desklet), - pDesklet); + pDesklet);*/ g_signal_connect (G_OBJECT (pWindow), "scroll-event", G_CALLBACK (on_scroll_desklet), @@ -1162,9 +1169,9 @@ if (pDesklet->pForeGroundSurface != NULL) cairo_surface_destroy (pDesklet->pForeGroundSurface); if (pDesklet->iBackGroundTexture != 0) - glDeleteTextures (1, &pDesklet->iBackGroundTexture); + _cairo_dock_delete_texture (pDesklet->iBackGroundTexture); if (pDesklet->iForeGroundTexture != 0) - glDeleteTextures (1, &pDesklet->iForeGroundTexture); + _cairo_dock_delete_texture (pDesklet->iForeGroundTexture); g_free(pDesklet); } @@ -1349,12 +1356,12 @@ } if (pDesklet->iBackGroundTexture != 0) { - glDeleteTextures (1, &pDesklet->iBackGroundTexture); + _cairo_dock_delete_texture (pDesklet->iBackGroundTexture); pDesklet->iBackGroundTexture = 0; } if (pDesklet->iForeGroundTexture != 0) { - glDeleteTextures (1, &pDesklet->iForeGroundTexture); + _cairo_dock_delete_texture (pDesklet->iForeGroundTexture); pDesklet->iForeGroundTexture = 0; } @@ -1495,4 +1502,4 @@ } cairo_dock_set_strut_partial (Xid, left, right, top, bottom, left_start_y, left_end_y, right_start_y, right_end_y, top_start_x, top_end_x, bottom_start_x, bottom_end_x); -} \ Pas de fin de ligne à la fin du fichier. +} diff -Nru cairo-dock-2.0.3/src/cairo-dock-desklet.h cairo-dock-2.0.5/src/cairo-dock-desklet.h --- cairo-dock-2.0.3/src/cairo-dock-desklet.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-desklet.h 2009-06-10 01:36:53.000000000 +0200 @@ -26,7 +26,7 @@ #ifndef __CAIRO_DESKLET_H__ #define __CAIRO_DESKLET_H__ -#include +#include "cairo-dock-container.h" G_BEGIN_DECLS #define CD_NB_ITER_FOR_GRADUATION 10 @@ -46,6 +46,7 @@ void cairo_dock_load_desklet_buttons (cairo_t *pSourceContext); void cairo_dock_load_desklet_buttons_texture (void); +void cairo_dock_unload_desklet_buttons_texture (void); gboolean cairo_dock_render_desklet_notification (gpointer pUserData, CairoDesklet *pDesklet); diff -Nru cairo-dock-2.0.3/src/cairo-dock-dialogs.c cairo-dock-2.0.5/src/cairo-dock-dialogs.c --- cairo-dock-2.0.3/src/cairo-dock-dialogs.c 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dialogs.c 2009-06-10 01:19:01.000000000 +0200 @@ -804,7 +804,7 @@ pDialog->pWidget = pWindow; - gtk_window_set_keep_above (GTK_WINDOW (pWindow), g_bKeepAbove || myAccessibility.bPopUp); + //gtk_window_set_keep_above (GTK_WINDOW (pWindow), g_bKeepAbove || myAccessibility.bPopUp); gtk_window_set_gravity (GTK_WINDOW (pWindow), GDK_GRAVITY_STATIC); gtk_window_set_title (GTK_WINDOW (pWindow), "cairo-dock-dialog"); diff -Nru cairo-dock-2.0.3/src/cairo-dock-dialogs.h cairo-dock-2.0.5/src/cairo-dock-dialogs.h --- cairo-dock-2.0.3/src/cairo-dock-dialogs.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dialogs.h 2009-06-10 01:52:12.000000000 +0200 @@ -2,7 +2,7 @@ #ifndef __CAIRO_DIALOGS__ #define __CAIRO_DIALOGS__ -#include "cairo-dock-struct.h" +#include "cairo-dock-container.h" G_BEGIN_DECLS /** @@ -16,8 +16,6 @@ * To add buttons, you specify a list of images. "ok" and "cancel" are key words for the default ok/cancel buttons. You also has to provide a callback function that will be called on click. When the user clicks on a button, the function is called with the number of the clicked button, counted from 0. -1 and -2 are set if the user pushed the Return or Escape keys. The dialog is de-referenced after the user's answer, so you have to reference the dialog in the callback if you want to keep the dialog alive. */ -typedef void (* CairoDockActionOnAnswerFunc) (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer data, CairoDialog *pDialog); - typedef gpointer CairoDialogRendererDataParameter; typedef CairoDialogRendererDataParameter* CairoDialogRendererDataPtr; typedef gpointer CairoDialogRendererConfigParameter; @@ -46,6 +44,8 @@ const gchar *cDisplayedName; }; +typedef void (* CairoDockActionOnAnswerFunc) (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer data, CairoDialog *pDialog); + struct _CairoDialogAttribute { gchar *cImageFilePath; gint iNbFrames; // 0 <=> 1. diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-facility.c cairo-dock-2.0.5/src/cairo-dock-dock-facility.c --- cairo-dock-2.0.3/src/cairo-dock-dock-facility.c 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-facility.c 2009-06-10 01:18:58.000000000 +0200 @@ -85,6 +85,22 @@ void cairo_dock_update_dock_size (CairoDock *pDock) // iMaxIconHeight et fFlatDockWidth doivent avoir ete mis a jour au prealable. { g_return_if_fail (pDock != NULL); + if (pDock->fRatio != 0 && pDock->fRatio != 1) // on remet leur taille reelle aux icones, sinon le calcul de max_dock_size sera biaise. + { + GList *ic; + Icon *icon; + pDock->fFlatDockWidth = -myIcons.iIconGap; + pDock->iMaxIconHeight = 0; + for (ic = pDock->icons; ic != NULL; ic = ic->next) + { + icon = ic->data; + icon->fWidth /= pDock->fRatio; + icon->fHeight /= pDock->fRatio; + pDock->fFlatDockWidth += icon->fWidth + myIcons.iIconGap; + pDock->iMaxIconHeight = MAX (pDock->iMaxIconHeight, icon->fHeight); + } + pDock->fRatio = 1.; + } pDock->calculate_max_dock_size (pDock); int iMaxAuthorizedWidth = cairo_dock_get_max_authorized_dock_width (pDock); @@ -92,7 +108,7 @@ do { double fPrevRatio = pDock->fRatio; - cd_debug (" %s (%d / %d)", __func__, (int)pDock->iMaxDockWidth, iMaxAuthorizedWidth); + //g_print (" %s (%d / %d)\n", __func__, (int)pDock->iMaxDockWidth, iMaxAuthorizedWidth); if (pDock->iMaxDockWidth > iMaxAuthorizedWidth) { pDock->fRatio *= 1. * iMaxAuthorizedWidth / pDock->iMaxDockWidth; @@ -116,7 +132,7 @@ if (fPrevRatio != pDock->fRatio) { - cd_debug (" -> changement du ratio : %.3f -> %.3f (%d, %d try)", fPrevRatio, pDock->fRatio, pDock->iRefCount, n); + //g_print (" -> changement du ratio : %.3f -> %.3f (%d, %d try)\n", fPrevRatio, pDock->fRatio, pDock->iRefCount, n); Icon *icon; GList *ic; pDock->fFlatDockWidth = -myIcons.iIconGap; @@ -133,7 +149,7 @@ } n ++; - } while ((pDock->iMaxDockWidth > iMaxAuthorizedWidth || pDock->iMaxDockHeight > g_iScreenHeight[pDock->bHorizontalDock]) && n < 3); + } while ((pDock->iMaxDockWidth > iMaxAuthorizedWidth || pDock->iMaxDockHeight > g_iScreenHeight[pDock->bHorizontalDock]) && n < 4); if (! pDock->bInside && (pDock->bAutoHide && pDock->iRefCount == 0)) return; @@ -309,10 +325,10 @@ else if (pDock->iWindowPositionX > g_iScreenWidth[pDock->bHorizontalDock] - iNewWidth + pDock->iMinRightMargin) pDock->iWindowPositionX = g_iScreenWidth[pDock->bHorizontalDock] - iNewWidth + pDock->iMinRightMargin; } - if (pDock->iWindowPositionY < 0) - pDock->iWindowPositionY = 0; - else if (pDock->iWindowPositionY > g_iScreenHeight[pDock->bHorizontalDock] - iNewHeight) - pDock->iWindowPositionY = g_iScreenHeight[pDock->bHorizontalDock] - iNewHeight; + if (pDock->iWindowPositionY < - pDock->iMaxIconHeight) + pDock->iWindowPositionY = - pDock->iMaxIconHeight; + else if (pDock->iWindowPositionY > g_iScreenHeight[pDock->bHorizontalDock] - iNewHeight + pDock->iMaxIconHeight) + pDock->iWindowPositionY = g_iScreenHeight[pDock->bHorizontalDock] - iNewHeight + pDock->iMaxIconHeight; pDock->iWindowPositionX += g_iScreenOffsetX; pDock->iWindowPositionY += g_iScreenOffsetY; diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-facility.h cairo-dock-2.0.5/src/cairo-dock-dock-facility.h --- cairo-dock-2.0.3/src/cairo-dock-dock-facility.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-facility.h 2009-06-10 01:38:33.000000000 +0200 @@ -10,17 +10,6 @@ G_BEGIN_DECLS -/** Teste si le container est un dock. -* @param pContainer le container. -* @return TRUE ssi le container a ete declare comme un dock. -*/ -#define CAIRO_DOCK_IS_DOCK(pContainer) (pContainer != NULL && (pContainer)->iType == CAIRO_DOCK_TYPE_DOCK) -/** Caste un container en dock. -* @param pContainer le container. -* @return le dock. -*/ -#define CAIRO_DOCK(pContainer) ((CairoDock *)pContainer) - /** Retourne la largeur max autorisee pour un dock. * @param pDock le dock. * @return la taille max. diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-factory.c cairo-dock-2.0.5/src/cairo-dock-dock-factory.c --- cairo-dock-2.0.3/src/cairo-dock-dock-factory.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-factory.c 2009-06-10 01:19:12.000000000 +0200 @@ -170,10 +170,10 @@ "realize", G_CALLBACK (_cairo_dock_on_realize_main_dock), NULL); - g_signal_connect (G_OBJECT (pWindow), + /*g_signal_connect (G_OBJECT (pWindow), "delete-event", G_CALLBACK (cairo_dock_on_delete), - pDock); + pDock);*/ g_signal_connect (G_OBJECT (pWindow), "expose-event", G_CALLBACK (cairo_dock_on_expose), @@ -525,6 +525,8 @@ cairo_dock_stop_polling_screen_edge (); cairo_dock_reset_docks_table (); // detruit tous les docks, vide la table, et met le main-dock a NULL. + + cairo_dock_unload_additionnal_textures (); } @@ -646,6 +648,11 @@ cairo_dock_stop_icon_animation (icon); + //\___________________ On desactive sa miniature. + if (icon->Xid != 0) + cairo_dock_set_xicon_geometry (icon->Xid, 0, 0, 0, 0); + + //\___________________ On l'enleve de la liste. if (pDock->pFirstDrawnElement != NULL && pDock->pFirstDrawnElement->data == icon) { diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-factory.h cairo-dock-2.0.5/src/cairo-dock-dock-factory.h --- cairo-dock-2.0.3/src/cairo-dock-dock-factory.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-factory.h 2009-06-10 01:47:57.000000000 +0200 @@ -6,8 +6,22 @@ #include "cairo-dock-struct.h" #include "cairo-dock-dock-facility.h" +#include "cairo-dock-container.h" G_BEGIN_DECLS + +/** Teste si le container est un dock. +* @param pContainer le container. +* @return TRUE ssi le container a ete declare comme un dock. +*/ +#define CAIRO_DOCK_IS_DOCK(pContainer) (pContainer != NULL && (pContainer)->iType == CAIRO_DOCK_TYPE_DOCK) +/** Caste un container en dock. +* @param pContainer le container. +* @return le dock. +*/ +#define CAIRO_DOCK(pContainer) ((CairoDock *)pContainer) + + /** * Cree un nouveau dock principal. * @param iWmHint indicateur du type de fenetre pour le WM. diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-manager.c cairo-dock-2.0.5/src/cairo-dock-dock-manager.c --- cairo-dock-2.0.3/src/cairo-dock-dock-manager.c 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-manager.c 2009-06-10 01:35:24.000000000 +0200 @@ -43,6 +43,7 @@ #include "cairo-dock-animations.h" #include "cairo-dock-internal-taskbar.h" #include "cairo-dock-internal-views.h" +#include "cairo-dock-container.h" #include "cairo-dock-dock-manager.h" extern CairoDock *g_pMainDock; @@ -330,7 +331,9 @@ { if (pDock->iRefCount > 0) return; + cairo_dock_prevent_dock_from_out_of_screen (pDock); + g_print ("%s (%d;%d)\n", __func__, pDock->iGapX, pDock->iGapY); if (pDock->bIsMainDock) { cairo_dock_update_conf_file_with_position (g_cConfFile, pDock->iGapX, pDock->iGapY); diff -Nru cairo-dock-2.0.3/src/cairo-dock-dock-manager.h cairo-dock-2.0.5/src/cairo-dock-dock-manager.h --- cairo-dock-2.0.3/src/cairo-dock-dock-manager.h 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-dock-manager.h 2009-06-10 01:50:21.000000000 +0200 @@ -5,11 +5,12 @@ #include #include "cairo-dock-struct.h" +#include "cairo-dock-dock-factory.h" G_BEGIN_DECLS /** -* Initialise la classe des docks. N'a aucun effet la 2eme fois. +* Initialise le gestionnaire des docks. N'a aucun effet la 2eme fois. */ void cairo_dock_initialize_dock_manager (void); diff -Nru cairo-dock-2.0.3/src/cairo-dock-draw.c cairo-dock-2.0.5/src/cairo-dock-draw.c --- cairo-dock-2.0.3/src/cairo-dock-draw.c 2009-05-23 00:57:50.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-draw.c 2009-06-10 01:31:20.000000000 +0200 @@ -36,6 +36,7 @@ #include "cairo-dock-internal-background.h" #include "cairo-dock-notifications.h" #include "cairo-dock-renderer-manager.h" +#include "cairo-dock-container.h" #include "cairo-dock-draw.h" extern gint g_iScreenWidth[2]; diff -Nru cairo-dock-2.0.3/src/cairo-dock-draw-opengl.c cairo-dock-2.0.5/src/cairo-dock-draw-opengl.c --- cairo-dock-2.0.3/src/cairo-dock-draw-opengl.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-draw-opengl.c 2009-06-10 02:30:51.000000000 +0200 @@ -44,6 +44,7 @@ #include "cairo-dock-internal-background.h" #include "cairo-dock-log.h" #include "cairo-dock-X-utilities.h" +#include "cairo-dock-container.h" #include "cairo-dock-draw-opengl.h" #include "texture-gradation.h" @@ -56,7 +57,6 @@ extern int g_iXScreenWidth[2]; extern int g_iXScreenHeight[2]; -extern int g_iBackgroundTexture; extern CairoDock *g_pMainDock; extern double g_fIndicatorWidth, g_fIndicatorHeight; @@ -647,15 +647,9 @@ if (g_iVisibleZoneTexture == 0) return ; - glEnable (GL_BLEND); - glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glEnable (GL_TEXTURE_2D); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - - glPolygonMode (GL_FRONT, GL_FILL); - - glColor4f (1., 1., 1., 1.); + _cairo_dock_enable_texture (); + _cairo_dock_set_blend_over (); + _cairo_dock_set_alpha (1.); glLoadIdentity (); glTranslatef (pDock->iCurrentWidth/2, pDock->iCurrentHeight/2, 0.); @@ -665,10 +659,9 @@ if (! pDock->bHorizontalDock) glRotatef (-90., 0, 0, 1); - cairo_dock_apply_texture_at_size (g_iVisibleZoneTexture, pDock->iCurrentWidth, pDock->iCurrentHeight); + _cairo_dock_apply_texture_at_size (g_iVisibleZoneTexture, pDock->iCurrentWidth, pDock->iCurrentHeight); - glDisable (GL_TEXTURE_2D); - glDisable (GL_BLEND); + _cairo_dock_disable_texture (); } @@ -709,7 +702,6 @@ int w = cairo_image_surface_get_width (pImageSurface); int h = cairo_image_surface_get_height (pImageSurface); - // GL_ARB_texture_non_power_of_two cairo_surface_t *pPowerOfwoSurface = pImageSurface; if (iNonPowerOfTwoAvailable == -1) @@ -717,8 +709,8 @@ iNonPowerOfTwoAvailable = _check_extension ("GL_ARB_texture_non_power_of_two"); cd_message ("non power of two available : %d", iNonPowerOfTwoAvailable); } - int iMaxTextureWidth = 4096, iMaxTextureHeight = 4096; - if (! iNonPowerOfTwoAvailable) + int iMaxTextureWidth = 4096, iMaxTextureHeight = 4096; // il faudrait le recuperer de glInfo ... + if (! iNonPowerOfTwoAvailable) // cas des vieilles cartes comme la GeForce5. { double log2_w = log (w) / log (2); double log2_h = log (h) / log (2); @@ -741,11 +733,10 @@ glEnable(GL_TEXTURE_2D); glGenTextures (1, &iTexture); - //g_print ("texture %d generee (%x, %dx%d)\n", iTexture, cairo_image_surface_get_data (pImageSurface), w, h); + cd_debug ("+ texture %d generee (%x, %dx%d)", iTexture, cairo_image_surface_get_data (pImageSurface), w, h); glBindTexture (GL_TEXTURE_2D, iTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D (GL_TEXTURE_2D, 0, 4, // GL_ALPHA / GL_BGRA @@ -757,6 +748,7 @@ cairo_image_surface_get_data (pPowerOfwoSurface)); if (pPowerOfwoSurface != pImageSurface) cairo_surface_destroy (pPowerOfwoSurface); + glDisable(GL_TEXTURE_2D); return iTexture; } @@ -796,7 +788,7 @@ glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, iWidth, iHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, pTextureRaw); glBindTexture (GL_TEXTURE_2D, 0); - + glDisable(GL_TEXTURE_2D); return iTexture; } @@ -804,6 +796,8 @@ { g_return_val_if_fail (GTK_WIDGET_REALIZED (g_pMainDock->pWidget), 0); double fWidth=0, fHeight=0; + if (cImagePath == NULL) + return 0; cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock)); cairo_surface_t *pSurface = cairo_dock_create_surface_from_image (cImagePath, pCairoContext, @@ -813,7 +807,7 @@ &fWidth, &fHeight, NULL, NULL); - cd_debug ("texture genere (%x, %.2fx%.2f)", pSurface, fWidth, fHeight); + //cd_debug ("texture genere (%x, %.2fx%.2f)", pSurface, fWidth, fHeight); cairo_destroy (pCairoContext); if (fImageWidth != NULL) @@ -867,7 +861,7 @@ { if (pIcon->iLabelTexture != 0) { - glDeleteTextures (1, &pIcon->iLabelTexture); + _cairo_dock_delete_texture (pIcon->iLabelTexture); pIcon->iLabelTexture = 0; } if (pIcon != NULL && pIcon->pTextBuffer != NULL) @@ -896,7 +890,7 @@ { if (pIcon->iQuickInfoTexture != 0) { - glDeleteTextures (1, &pIcon->iQuickInfoTexture); + _cairo_dock_delete_texture (pIcon->iQuickInfoTexture); pIcon->iQuickInfoTexture = 0; } if (pIcon != NULL && pIcon->pQuickInfoBuffer != NULL) @@ -1277,8 +1271,14 @@ void cairo_dock_draw_frame_background_opengl (GLuint iBackgroundTexture, double fDockWidth, double fFrameHeight, double fDockOffsetX, double fDockOffsetY, const GLfloat *pVertexTab, int iNbVertex, CairoDockTypeHorizontality bHorizontal, gboolean bDirectionUp, double fDecorationsOffsetX) { //\__________________ On mappe la texture dans le cadre. + glEnable(GL_BLEND); // On active le blend + + glPolygonMode(GL_FRONT, GL_FILL); + if (iBackgroundTexture != 0) { + glColor4f(1., 1., 1., 1.); // Couleur a fond + glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_TEXTURE_2D); // Je veux de la texture glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glBindTexture(GL_TEXTURE_2D, iBackgroundTexture); // allez on bind la texture @@ -1289,12 +1289,6 @@ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glEnable(GL_BLEND); // On active le blend - //glBlendFunc (GL_ONE, GL_ZERO); - glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - glColor4f(1., 1., 1., 1.); // Couleur a fond - glPolygonMode(GL_FRONT, GL_FILL); - //\__________________ bidouille de la texture. glMatrixMode(GL_TEXTURE); // On selectionne la matrice des textures glPushMatrix (); @@ -1303,9 +1297,10 @@ glScalef (1., -1., 1.); glMatrixMode(GL_MODELVIEW); } - + else + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //\__________________ On place le cadre. - glLoadIdentity(); + ///glLoadIdentity(); if (bHorizontal) { glTranslatef ((int) (fDockOffsetX + fDockWidth/2), (int) (fDockOffsetY - fFrameHeight/2), -100); // (int) -pDock->iMaxIconHeight * (1 + myIcons.fAmplitude) + 1 @@ -1333,7 +1328,6 @@ //\__________________ On dessine le cadre. glEnableClientState(GL_VERTEX_ARRAY); - //glVertexPointer(_CAIRO_DOCK_PATH_DIM, GL_FLOAT, 0, pVertexTab); _cairo_dock_set_vertex_pointer (pVertexTab); glDrawArrays(GL_POLYGON, 0, iNbVertex); // GL_TRIANGLE_FAN glDisableClientState(GL_VERTEX_ARRAY); @@ -1361,7 +1355,8 @@ glEnable(GL_BLEND); glLineWidth(fLineWidth); // Ici on choisi l'epaisseur du contour du polygone - glColor4f(fLineColor[0], fLineColor[1], fLineColor[2], fLineColor[3]); // Et sa couleur + if (fLineColor != NULL) + glColor4f (fLineColor[0], fLineColor[1], fLineColor[2], fLineColor[3]); // Et sa couleur. glEnableClientState(GL_VERTEX_ARRAY); ///glVertexPointer(3, GL_FLOAT, 0, pVertexTab); @@ -1384,7 +1379,25 @@ cairo_dock_draw_current_path_opengl (fStringLineWidth, myIcons.fStringColor, iNbVertex); } - +void cairo_dock_draw_rounded_rectangle_opengl (double fRadius, double fLineWidth, double fFrameWidth, double fFrameHeight, double fOffsetX, double fOffsetY, double *fLineColor) +{ + int iNbVertex = 0; + const GLfloat *pVertexTab = cairo_dock_generate_rectangle_path (fFrameWidth, fFrameHeight, fRadius, TRUE, &iNbVertex); + + if (fLineWidth == 0) + { + if (fLineColor != NULL) + glColor4f (fLineColor[0], fLineColor[1], fLineColor[2], fLineColor[3]); + cairo_dock_draw_frame_background_opengl (0, fFrameWidth+2*fRadius, fFrameHeight, fOffsetX, fOffsetY, pVertexTab, iNbVertex, CAIRO_DOCK_HORIZONTAL, TRUE, 0.); + } + else + { + _cairo_dock_set_vertex_pointer (pVertexTab); + glTranslatef ((int) (fOffsetX + fFrameWidth/2), (int) (fOffsetY - fFrameHeight/2), -1); + glScalef (fFrameHeight, fFrameWidth, 1.); + cairo_dock_draw_current_path_opengl (fLineWidth, fLineColor, iNbVertex); + } +} GLXPbuffer cairo_dock_create_pbuffer (int iWidth, int iHeight, GLXContext *pContext) { @@ -1488,7 +1501,7 @@ glClearColor (0.0f, 0.0f, 0.0f, 0.0f); glClearDepth (1.0f); } - g_print (" ok, seems fine\n"); + g_print (" ok, they seem fine enough.\n"); } } diff -Nru cairo-dock-2.0.3/src/cairo-dock-draw-opengl.h cairo-dock-2.0.5/src/cairo-dock-draw-opengl.h --- cairo-dock-2.0.3/src/cairo-dock-draw-opengl.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-draw-opengl.h 2009-06-10 01:18:58.000000000 +0200 @@ -128,6 +128,7 @@ void cairo_dock_draw_frame_background_opengl (GLuint iBackgroundTexture, double fDockWidth, double fFrameHeight, double fDockOffsetX, double fDockOffsetY, const GLfloat *pVertexTab, int iNbVertex, CairoDockTypeHorizontality bHorizontal, gboolean bDirectionUp, double fDecorationsOffsetX); void cairo_dock_draw_current_path_opengl (double fLineWidth, double *fLineColor, int iNbVertex); +void cairo_dock_draw_rounded_rectangle_opengl (double fRadius, double fLineWidth, double fFrameWidth, double fFrameHeight, double fDockOffsetX, double fDockOffsetY, double *fLineColor); GLfloat *cairo_dock_generate_string_path_opengl (CairoDock *pDock, gboolean bIsLoop, gboolean bForceConstantSeparator, int *iNbPoints); void cairo_dock_draw_string_opengl (CairoDock *pDock, double fStringLineWidth, gboolean bIsLoop, gboolean bForceConstantSeparator); diff -Nru cairo-dock-2.0.3/src/cairo-dock-gauge2.c cairo-dock-2.0.5/src/cairo-dock-gauge2.c --- cairo-dock-2.0.3/src/cairo-dock-gauge2.c 1970-01-01 01:00:00.000000000 +0100 +++ cairo-dock-2.0.5/src/cairo-dock-gauge2.c 2009-06-10 01:19:02.000000000 +0200 @@ -0,0 +1,824 @@ +/********************************************************************************* + +This file is a part of the cairo-dock program, +released under the terms of the GNU General Public License. + +Written by Necropotame (for any bug report, please mail me to fabounet@users.berlios.de) + +*********************************************************************************/ +#include +#include +#include +#include + +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern gchar *g_cCairoDockDataDir; +extern gboolean g_bUseOpenGL; + + //////////////////////////////////////////// + /////////////// LOAD GAUGE ///////////////// +//////////////////////////////////////////// +void cairo_dock_xml_open_file2 (const gchar *filePath, const gchar *mainNodeName,xmlDocPtr *myXmlDoc,xmlNodePtr *myXmlNode) +{ + xmlDocPtr doc = xmlParseFile (filePath); + if (doc == NULL) + { + cd_warning ("Impossible de lire le fichier XML."); + *myXmlDoc = NULL; + *myXmlNode = NULL; + return ; + } + + xmlNodePtr node = xmlDocGetRootElement (doc); + if (node == NULL || xmlStrcmp (node->name, (const xmlChar *) mainNodeName) != 0) + { + cd_warning ("Le format du fichier XML n'est pas valide."); + *myXmlDoc = NULL; + *myXmlNode = NULL; + return ; + } + + *myXmlDoc = doc; + *myXmlNode = node; +} + +static void _cairo_dock_init_gauge_image (const gchar *cImagePath, GaugeImage2 *pGaugeImage2) +{ + // chargement du fichier. + pGaugeImage2->pSvgHandle = rsvg_handle_new_from_file (cImagePath, NULL); + + //On récupère la taille de l'image. + RsvgDimensionData SizeInfo; + rsvg_handle_get_dimensions (pGaugeImage2->pSvgHandle, &SizeInfo); + pGaugeImage2->sizeX = SizeInfo.width; + pGaugeImage2->sizeY = SizeInfo.height; +} +static GaugeImage2 *_cairo_dock_new_gauge_image (const gchar *cImagePath) +{ + cd_debug ("%s (%s)", __func__, cImagePath); + GaugeImage2 *pGaugeImage2 = g_new0 (GaugeImage2, 1); + + _cairo_dock_init_gauge_image (cImagePath, pGaugeImage2); + + return pGaugeImage2; +} +static void _cairo_dock_load_gauge_image (cairo_t *pSourceContext, GaugeImage2 *pGaugeImage2, int iWidth, int iHeight) +{ + cd_message ("%s (%dx%d)", __func__, iWidth, iHeight); + if (pGaugeImage2->pSurface != NULL) + cairo_surface_destroy (pGaugeImage2->pSurface); + if (pGaugeImage2->iTexture != 0) + glDeleteTextures (1, &pGaugeImage2->iTexture); + + if (pGaugeImage2->pSvgHandle != NULL) + { + pGaugeImage2->pSurface = _cairo_dock_create_blank_surface (pSourceContext, + iWidth, + iHeight); + + cairo_t* pDrawingContext = cairo_create (pGaugeImage2->pSurface); + + cairo_scale (pDrawingContext, + (double) iWidth / (double) pGaugeImage2->sizeX, + (double) iHeight / (double) pGaugeImage2->sizeY); + + rsvg_handle_render_cairo (pGaugeImage2->pSvgHandle, pDrawingContext); + cairo_destroy (pDrawingContext); + + if (g_bUseOpenGL) + { + pGaugeImage2->iTexture = cairo_dock_create_texture_from_surface (pGaugeImage2->pSurface); + } + } + else + { + pGaugeImage2->pSurface = NULL; + pGaugeImage2->iTexture = 0; + } +} +static void _cairo_dock_load_gauge_needle (cairo_t *pSourceContext, GaugeIndicator2 *pGaugeIndicator2, int iWidth, int iHeight) +{ + cd_message ("%s (%dx%d)", __func__, iWidth, iHeight); + GaugeImage2 *pGaugeImage2 = pGaugeIndicator2->pImageNeedle; + g_return_if_fail (pGaugeImage2 != NULL); + + if (pGaugeImage2->pSurface != NULL) + cairo_surface_destroy (pGaugeImage2->pSurface); + if (pGaugeImage2->iTexture != 0) + glDeleteTextures (1, &pGaugeImage2->iTexture); + + if (pGaugeImage2->pSvgHandle != NULL) + { + int iSize = MIN (iWidth, iHeight); + g_print ("size:%d ; %d\n", iSize, pGaugeImage2->sizeX); + pGaugeIndicator2->fNeedleScale = (double)iSize / (double) pGaugeImage2->sizeX; // car l'aiguille est a l'horizontale dans le fichier svg. + pGaugeIndicator2->iNeedleWidth = (double) pGaugeIndicator2->iNeedleRealWidth * pGaugeIndicator2->fNeedleScale; + pGaugeIndicator2->iNeedleHeight = (double) pGaugeIndicator2->iNeedleRealHeight * pGaugeIndicator2->fNeedleScale; + + cairo_surface_t *pNeedleSurface = _cairo_dock_create_blank_surface (pSourceContext, pGaugeIndicator2->iNeedleWidth, pGaugeIndicator2->iNeedleHeight); + g_return_if_fail (cairo_surface_status (pNeedleSurface) == CAIRO_STATUS_SUCCESS); + + cairo_t* pDrawingContext = cairo_create (pNeedleSurface); + g_return_if_fail (cairo_status (pDrawingContext) == CAIRO_STATUS_SUCCESS); + + cairo_scale (pDrawingContext, pGaugeIndicator2->fNeedleScale, pGaugeIndicator2->fNeedleScale); + cairo_translate (pDrawingContext, pGaugeIndicator2->iNeedleOffsetX, pGaugeIndicator2->iNeedleOffsetY); + rsvg_handle_render_cairo (pGaugeImage2->pSvgHandle, pDrawingContext); + cairo_destroy (pDrawingContext); + + pGaugeImage2->iTexture = cairo_dock_create_texture_from_surface (pNeedleSurface); + cairo_surface_destroy (pNeedleSurface); + } + else + { + pGaugeImage2->pSurface = NULL; + pGaugeImage2->iTexture = 0; + } +} +static gboolean cairo_dock_load_gauge_theme (Gauge2 *pGauge, cairo_t *pSourceContext, const gchar *cThemePath) +{ + cd_debug ("%s (%s)", __func__, cThemePath); + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + if (iWidth == 0 || iHeight == 0) + return FALSE; + + g_return_val_if_fail (cThemePath != NULL, FALSE); + xmlInitParser (); + xmlDocPtr pGaugeTheme; + xmlNodePtr pGaugeMainNode; + gchar *cXmlFile = g_strdup_printf("%s/theme.xml",cThemePath); + cairo_dock_xml_open_file2 (cXmlFile, "gauge",&pGaugeTheme,&pGaugeMainNode); + g_free (cXmlFile); + g_return_val_if_fail (pGaugeTheme != NULL, FALSE); + + xmlAttrPtr ap; + xmlChar *cAttribute, *cNodeContent, *cTextNodeContent; + GString *sImagePath = g_string_new (""); + GaugeImage2 *pGaugeImage2; + GaugeIndicator2 *pGaugeIndicator2 = NULL; + xmlNodePtr pGaugeNode; + for (pGaugeNode = pGaugeMainNode->xmlChildrenNode; pGaugeNode != NULL; pGaugeNode = pGaugeNode->next) + { + if (xmlStrcmp (pGaugeNode->name, (const xmlChar *) "name") == 0) + { + pGauge->cThemeName = xmlNodeGetContent(pGaugeNode); + cd_debug("gauge : Nom du theme(%s)",pGauge->pIndicatorList); + } + else if (xmlStrcmp (pGaugeNode->name, (const xmlChar *) "rank") == 0) + { + cNodeContent = xmlNodeGetContent (pGaugeNode); + CAIRO_DATA_RENDERER (pGauge)->iRank = atoi (cNodeContent); + xmlFree (cNodeContent); + } + else if (xmlStrcmp (pGaugeNode->name, (const xmlChar *) "file") == 0) + { + cNodeContent = xmlNodeGetContent (pGaugeNode); + g_string_printf (sImagePath, "%s/%s", cThemePath, cNodeContent); + ap = xmlHasProp (pGaugeNode, "key"); + cAttribute = xmlNodeGetContent(ap->xmlChildrenNode); + if (xmlStrcmp (cAttribute, "background") == 0) + { + pGauge->pImageBackground = _cairo_dock_new_gauge_image (sImagePath->str); + _cairo_dock_load_gauge_image (pSourceContext, pGauge->pImageBackground, iWidth, iHeight); + } + else if (xmlStrcmp (cAttribute, "foreground") == 0) + { + pGauge->pImageForeground = _cairo_dock_new_gauge_image (sImagePath->str); + _cairo_dock_load_gauge_image (pSourceContext, pGauge->pImageForeground, iWidth, iHeight); + } + xmlFree (cNodeContent); + xmlFree (cAttribute); + } + else if (xmlStrcmp (pGaugeNode->name, (const xmlChar *) "indicator") == 0) + { + if (CAIRO_DATA_RENDERER (pGauge)->iRank == 0) + { + CAIRO_DATA_RENDERER (pGauge)->iRank = 1; + xmlNodePtr node; + for (node = pGaugeNode->next; node != NULL; node = node->next) + { + if (xmlStrcmp (node->name, (const xmlChar *) "indicator") == 0) + CAIRO_DATA_RENDERER (pGauge)->iRank ++; + } + } + + pGaugeIndicator2 = g_new0 (GaugeIndicator2, 1); + pGaugeIndicator2->direction = 1; + + cd_debug ("gauge : On charge un indicateur"); + xmlNodePtr pGaugeSubNode; + for (pGaugeSubNode = pGaugeNode->xmlChildrenNode; pGaugeSubNode != NULL; pGaugeSubNode = pGaugeSubNode->next) + { + cNodeContent = xmlNodeGetContent (pGaugeSubNode); + if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "posX") == 0) + pGaugeIndicator2->posX = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "posY") == 0) + pGaugeIndicator2->posY = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "text") == 0) + { + xmlNodePtr pTextSubNode; + for (pTextSubNode = pGaugeSubNode->xmlChildrenNode; pTextSubNode != NULL; pTextSubNode = pTextSubNode->next) + { + cTextNodeContent = xmlNodeGetContent (pTextSubNode); + if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textX") == 0) + pGaugeIndicator2->textX = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textY") == 0) + pGaugeIndicator2->textY = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textWidth") == 0) + pGaugeIndicator2->textWidth = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textHeight") == 0) + pGaugeIndicator2->textHeight = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textColorR") == 0) + pGaugeIndicator2->textColor[0] = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textColorG") == 0) + pGaugeIndicator2->textColor[1] = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "textColorB") == 0) + pGaugeIndicator2->textColor[2] = atof (cNodeContent); + } + } + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "direction") == 0) + pGaugeIndicator2->direction = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "posStart") == 0) + pGaugeIndicator2->posStart = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "posStop") == 0) + pGaugeIndicator2->posStop = atof (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "nb images") == 0) + pGaugeIndicator2->iNbImages = atoi (cNodeContent); + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "offset x") == 0) + { + pGaugeIndicator2->iNeedleOffsetX = atoi (cNodeContent); + } + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "width") == 0) + { + pGaugeIndicator2->iNeedleRealWidth = atoi (cNodeContent); + } + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "height") == 0) + { + pGaugeIndicator2->iNeedleRealHeight = atoi (cNodeContent); + pGaugeIndicator2->iNeedleOffsetY = .5 * pGaugeIndicator2->iNeedleRealHeight; + } + else if(xmlStrcmp (pGaugeSubNode->name, (const xmlChar *) "file") == 0) + { + cd_debug("gauge : On charge un fichier (%s)",cNodeContent); + ap = xmlHasProp(pGaugeSubNode, "key"); + cAttribute = xmlNodeGetContent(ap->xmlChildrenNode); + if (strcmp (cAttribute, "needle") == 0 && pGaugeIndicator2->pImageNeedle == NULL) + { + g_string_printf (sImagePath, "%s/%s", cThemePath, cNodeContent); + pGaugeIndicator2->pImageNeedle = _cairo_dock_new_gauge_image (sImagePath->str); + } + else if (strcmp (cAttribute,"image") == 0) + { + if (pGaugeIndicator2->iNbImages == 0) + { + pGaugeIndicator2->iNbImages = 1; + xmlNodePtr node; + for (node = pGaugeSubNode->next; node != NULL; node = node->next) + { + if (xmlStrcmp (node->name, (const xmlChar *) "file") == 0) + pGaugeIndicator2->iNbImages ++; + } + } + if (pGaugeIndicator2->pImageList == NULL) + pGaugeIndicator2->pImageList = g_new0 (GaugeImage2, pGaugeIndicator2->iNbImages); + + if (pGaugeIndicator2->iNbImageLoaded < pGaugeIndicator2->iNbImages) + { + g_string_printf (sImagePath, "%s/%s", cThemePath, cNodeContent); + _cairo_dock_init_gauge_image (sImagePath->str, &pGaugeIndicator2->pImageList[pGaugeIndicator2->iNbImageLoaded]); + pGaugeIndicator2->iNbImageLoaded ++; + } + } + xmlFree (cAttribute); + } + xmlFree (cNodeContent); + } + if (pGaugeIndicator2->pImageNeedle != NULL) // taille par defaut de l'aiguille si non fournie. + { + if (pGaugeIndicator2->iNeedleRealHeight == 0) + { + pGaugeIndicator2->iNeedleRealHeight = .12*pGaugeIndicator2->pImageNeedle->sizeY; // 12px utiles sur les 100 + pGaugeIndicator2->iNeedleOffsetY = pGaugeIndicator2->iNeedleRealHeight/2; + } + if (pGaugeIndicator2->iNeedleRealWidth == 0) + { + pGaugeIndicator2->iNeedleRealWidth = pGaugeIndicator2->pImageNeedle->sizeY; // 100px utiles sur les 100 + pGaugeIndicator2->iNeedleOffsetX = 10; + } + } + pGauge->pIndicatorList = g_list_append (pGauge->pIndicatorList, pGaugeIndicator2); + } + } + xmlFreeDoc (pGaugeTheme); + xmlCleanupParser (); + g_string_free (sImagePath, TRUE); + + g_return_val_if_fail (CAIRO_DATA_RENDERER (pGauge)->iRank != 0 && pGaugeIndicator2 != NULL, FALSE); + CAIRO_DATA_RENDERER (pGauge)->bCanRenderValueAsText = (pGaugeIndicator2->textWidth != 0 && pGaugeIndicator2->textHeight != 0); + + return TRUE; +} +void cairo_dock_load_gauge2 (Gauge2 *pGauge, cairo_t *pSourceContext, CairoContainer *pContainer, CairoGaugeAttribute *pAttribute) +{ + gboolean bLoadOK = cairo_dock_load_gauge_theme (pGauge, pSourceContext, pAttribute->cThemePath); +} + + //////////////////////////////////////////// + /////////////// DRAW GAUGE ///////////////// +//////////////////////////////////////////// +static void _draw_gauge_needle (cairo_t *pSourceContext, Gauge2 *pGauge, GaugeIndicator2 *pGaugeIndicator2, double fValue) +{ + GaugeImage2 *pGaugeImage2 = pGaugeIndicator2->pImageNeedle; + if(pGaugeImage2 != NULL) + { + double fAngle = (pGaugeIndicator2->posStart + fValue * (pGaugeIndicator2->posStop - pGaugeIndicator2->posStart)) * G_PI / 180.; + if (pGaugeIndicator2->direction < 0) + fAngle = - fAngle; + + double fHalfX = pGauge->pImageBackground->sizeX / 2.0f * (1 + pGaugeIndicator2->posX); + double fHalfY = pGauge->pImageBackground->sizeY / 2.0f * (1 - pGaugeIndicator2->posY); + + cairo_save (pSourceContext); + + cairo_scale (pSourceContext, + (double) CAIRO_DATA_RENDERER (pGauge)->iWidth / (double) pGaugeImage2->sizeX, + (double) CAIRO_DATA_RENDERER (pGauge)->iHeight / (double) pGaugeImage2->sizeY); + cairo_translate (pSourceContext, fHalfX, fHalfY); + cairo_rotate (pSourceContext, -G_PI/2 + fAngle); + + rsvg_handle_render_cairo (pGaugeImage2->pSvgHandle, pSourceContext); + + cairo_restore (pSourceContext); + } +} +static void _draw_gauge_image (cairo_t *pSourceContext, Gauge2 *pGauge, GaugeIndicator2 *pGaugeIndicator2, double fValue) +{ + int iNumImage = fValue * (pGaugeIndicator2->iNbImages - 1) + 0.5; + g_return_if_fail (iNumImage < pGaugeIndicator2->iNbImages); + + GaugeImage2 *pGaugeImage2 = &pGaugeIndicator2->pImageList[iNumImage]; + if (pGaugeImage2->pSurface == NULL) + { + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + _cairo_dock_load_gauge_image (pSourceContext, pGaugeImage2, iWidth, iHeight); + } + + if (pGaugeImage2->pSurface != NULL) + { + cairo_set_source_surface (pSourceContext, pGaugeImage2->pSurface, 0.0f, 0.0f); + cairo_paint (pSourceContext); + } +} +static void cairo_dock_draw_one_gauge (cairo_t *pSourceContext, Gauge2 *pGauge, int iDataOffset) +{ + GaugeImage2 *pGaugeImage2; + //\________________ On affiche le fond. + if(pGauge->pImageBackground != NULL) + { + pGaugeImage2 = pGauge->pImageBackground; + cairo_set_source_surface (pSourceContext, pGaugeImage2->pSurface, 0.0f, 0.0f); + cairo_paint (pSourceContext); + } + + //\________________ On represente l'indicateur de chaque valeur. + GList *pIndicatorElement; + GList *pValueList; + double fValue; + GaugeIndicator2 *pIndicator; + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + CairoDataToRenderer *pData = cairo_data_renderer_get_data (pRenderer); + int i; + for (i = iDataOffset, pIndicatorElement = pGauge->pIndicatorList; i < pData->iNbValues && pIndicatorElement != NULL; i++, pIndicatorElement = pIndicatorElement->next) + { + pIndicator = pIndicatorElement->data; + fValue = cairo_data_renderer_get_normalized_current_value (pRenderer, i); + + if (pIndicator->pImageNeedle != NULL) // c'est une aiguille. + { + _draw_gauge_needle (pSourceContext, pGauge, pIndicator, fValue); + } + else // c'est une image. + { + _draw_gauge_image (pSourceContext, pGauge, pIndicator, fValue); + } + + if (pIndicator->textWidth != 0 && pIndicator->textHeight != 0) // cet indicateur a un emplacement pour le texte de la valeur. + { + cairo_data_renderer_format_value (pRenderer, fValue, i); + g_print (" >>>%s\n", pRenderer->cFormatBuffer); + cairo_save (pSourceContext); + cairo_set_source_rgb (pSourceContext, pIndicator->textColor[0], pIndicator->textColor[1], pIndicator->textColor[2]); + cairo_set_line_width (pSourceContext, 20.); + + cairo_text_extents_t textExtents; + cairo_text_extents (pSourceContext, pRenderer->cFormatBuffer, &textExtents); + cairo_move_to (pSourceContext, + pIndicator->textX * pRenderer->iWidth - textExtents.width / 2, + pIndicator->textY * pRenderer->iHeight + textExtents.height / 2); + cairo_show_text (pSourceContext, pRenderer->cFormatBuffer); + cairo_restore (pSourceContext); + } + } + + //\________________ On affiche l'avant-plan. + if(pGauge->pImageForeground != NULL) + { + pGaugeImage2 = pGauge->pImageForeground; + cairo_set_source_surface (pSourceContext, pGaugeImage2->pSurface, 0.0f, 0.0f); + cairo_paint (pSourceContext); + } +} +void cairo_dock_render_gauge2 (Gauge2 *pGauge, cairo_t *pCairoContext) +{ + g_return_if_fail (pGauge != NULL && pGauge->pIndicatorList != NULL && pCairoContext != NULL); + g_return_if_fail (cairo_status (pCairoContext) == CAIRO_STATUS_SUCCESS); + + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + CairoDataToRenderer *pData = cairo_data_renderer_get_data (pRenderer); + int iNbDrawings = (int) ceil (1. * pData->iNbValues / pRenderer->iRank); + int i, iDataOffset = 0; + for (i = 0; i < iNbDrawings; i ++) + { + if (iNbDrawings > 1) // on va dessiner la jauges plusieurs fois, la 1ere en grand et les autres en petit autour. + { + cairo_save (pCairoContext); + if (i == 0) + { + cairo_scale (pCairoContext, 2./3, 2./3); + } + else if (i == 1) + { + cairo_translate (pCairoContext, 2 * pRenderer->iWidth / 3, 2 * pRenderer->iHeight / 3); + cairo_scale (pCairoContext, 1./3, 1./3); + } + else if (i == 2) + { + cairo_translate (pCairoContext, 2 * pRenderer->iWidth / 3, 0.); + cairo_scale (pCairoContext, 1./3, 1./3); + } + else if (i == 3) + { + cairo_translate (pCairoContext, 0., 2 * pRenderer->iHeight / 3); + cairo_scale (pCairoContext, 1./3, 1./3); + } + else // 5 valeurs faut pas pousser non plus. + break ; + } + + cairo_dock_draw_one_gauge (pCairoContext, pGauge, iDataOffset); + + if (iNbDrawings > 1) + cairo_restore (pCairoContext); + + iDataOffset += pRenderer->iRank; + } +} + + /////////////////////////////////////////////// + /////////////// RENDER OPENGL ///////////////// +/////////////////////////////////////////////// +static void _draw_gauge_image_opengl (Gauge2 *pGauge, GaugeIndicator2 *pGaugeIndicator2, double fValue) +{ + int iNumImage = fValue * (pGaugeIndicator2->iNbImages - 1) + 0.5; + g_return_if_fail (iNumImage < pGaugeIndicator2->iNbImages); + + GaugeImage2 *pGaugeImage2 = &pGaugeIndicator2->pImageList[iNumImage]; + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + if (pGaugeImage2->iTexture == 0) + { + _cairo_dock_load_gauge_image (NULL, pGaugeImage2, iWidth, iHeight); // pas besoin d'un cairo_context pour creer une cairo_image_surface. + } + + if (pGaugeImage2->iTexture != 0) + { + cairo_dock_apply_texture_at_size (pGaugeImage2->iTexture, iWidth, iHeight); + } +} +static void _draw_gauge_needle_opengl (Gauge2 *pGauge, GaugeIndicator2 *pGaugeIndicator2, double fValue) +{ + GaugeImage2 *pGaugeImage2 = pGaugeIndicator2->pImageNeedle; + g_return_if_fail (pGaugeImage2 != NULL); + + if (pGaugeImage2->iTexture == 0) + { + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + _cairo_dock_load_gauge_needle (NULL, pGaugeIndicator2, iWidth, iHeight); // pas besoin d'un cairo_context pour creer une cairo_image_surface. + } + + if(pGaugeImage2->iTexture != 0) + { + double fAngle = (pGaugeIndicator2->posStart + fValue * (pGaugeIndicator2->posStop - pGaugeIndicator2->posStart)); + if (pGaugeIndicator2->direction < 0) + fAngle = - fAngle; + double fHalfX = pGauge->pImageBackground->sizeX / 2.0f * (0 + pGaugeIndicator2->posX); + double fHalfY = pGauge->pImageBackground->sizeY / 2.0f * (0 + pGaugeIndicator2->posY); + + glPushMatrix (); + + glTranslatef (fHalfX, fHalfY, 0.); + glRotatef (90. - fAngle, 0., 0., 1.); + glTranslatef (pGaugeIndicator2->iNeedleWidth/2 - pGaugeIndicator2->fNeedleScale * pGaugeIndicator2->iNeedleOffsetX, 0., 0.); + glScalef (pGaugeIndicator2->iNeedleWidth, pGaugeIndicator2->iNeedleHeight, 1.); + cairo_dock_apply_texture (pGaugeImage2->iTexture); + + glPopMatrix (); + } +} +static void cairo_dock_draw_one_gauge_opengl (Gauge2 *pGauge, int iDataOffset) +{ + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + GaugeImage2 *pGaugeImage2; + + glEnable (GL_BLEND); + glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); // ne me demandez pas pourquoi... + + glEnable (GL_TEXTURE_2D); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + + glPolygonMode (GL_FRONT, GL_FILL); + + //\________________ On affiche le fond. + if(pGauge->pImageBackground != NULL) + { + pGaugeImage2 = pGauge->pImageBackground; + cairo_dock_apply_texture_at_size (pGaugeImage2->iTexture, iWidth, iHeight); + } + + //\________________ On represente l'indicateur de chaque valeur. + GList *pIndicatorElement; + GList *pValueList; + double fValue; + GaugeIndicator2 *pIndicator; + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + CairoDataToRenderer *pData = cairo_data_renderer_get_data (pRenderer); + int i; + for (i = iDataOffset, pIndicatorElement = pGauge->pIndicatorList; i < pData->iNbValues && pIndicatorElement != NULL; i++, pIndicatorElement = pIndicatorElement->next) + { + pIndicator = pIndicatorElement->data; + fValue = cairo_data_renderer_get_normalized_current_value_with_latency (pRenderer, i); + + if (pIndicator->pImageNeedle != NULL) // c'est une aiguille. + { + _draw_gauge_needle_opengl (pGauge, pIndicator, fValue); + } + else // c'est une image. + { + _draw_gauge_image_opengl (pGauge, pIndicator, fValue); + } + + if (pIndicator->textWidth != 0 && pIndicator->textHeight != 0) // cet indicateur a un emplacement pour le texte de la valeur. + { + cairo_data_renderer_format_value (pRenderer, fValue, i); + g_print (" >>>%s\n", pRenderer->cFormatBuffer); + /*cairo_save (pSourceContext); + cairo_set_source_rgb (pSourceContext, pIndicator->textColor[0], pIndicator->textColor[1], pIndicator->textColor[2]); + cairo_set_line_width (pSourceContext, 20.); + + cairo_text_extents_t textExtents; + cairo_text_extents (pSourceContext, pRenderer->cFormatBuffer, &textExtents); + cairo_move_to (pSourceContext, + pIndicator->textX * pRenderer->iWidth - textExtents.width / 2, + pIndicator->textY * pRenderer->iHeight + textExtents.height / 2); + cairo_show_text (pSourceContext, pRenderer->cFormatBuffer); + cairo_restore (pSourceContext);*/ + } + } + + //\________________ On affiche l'avant-plan. + if(pGauge->pImageForeground != NULL) + { + pGaugeImage2 = pGauge->pImageForeground; + cairo_dock_apply_texture_at_size (pGaugeImage2->iTexture, iWidth, iHeight); + } + + glDisable (GL_TEXTURE_2D); + glDisable (GL_BLEND); +} +void cairo_dock_render_gauge_opengl2 (Gauge2 *pGauge) +{ + g_return_if_fail (pGauge != NULL && pGauge->pIndicatorList != NULL); + + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + CairoDataToRenderer *pData = cairo_data_renderer_get_data (pRenderer); + int iNbDrawings = (int) ceil (1. * pData->iNbValues / pRenderer->iRank); + int i, iDataOffset = 0; + for (i = 0; i < iNbDrawings; i ++) + { + if (iNbDrawings > 1) // on va dessiner la jauges plusieurs fois, la 1ere en grand et les autres en petit autour. + { + glPushMatrix (); + if (i == 0) + { + glTranslatef (-pRenderer->iWidth / 6, pRenderer->iHeight / 6, 0.); + glScalef (2./3, 2./3, 1.); + } + else if (i == 1) + { + glTranslatef (pRenderer->iWidth / 3, - pRenderer->iHeight / 3, 0.); + glScalef (1./3, 1./3, 1.); + } + else if (i == 2) + { + glTranslatef (pRenderer->iWidth / 3, pRenderer->iHeight / 3, 0.); + glScalef (1./3, 1./3, 1.); + } + else if (i == 3) + { + glTranslatef (-pRenderer->iWidth / 3, -pRenderer->iHeight / 3, 0.); + glScalef (1./3, 1./3, 1.); + } + else // 5 valeurs faut pas pousser non plus. + break ; + } + + cairo_dock_draw_one_gauge_opengl (pGauge, iDataOffset); + + if (iNbDrawings > 1) + glPopMatrix (); + + iDataOffset += pRenderer->iRank; + } +} + + + ////////////////////////////////////////////// + /////////////// RELOAD GAUGE ///////////////// +////////////////////////////////////////////// +void cairo_dock_reload_gauge2 (Gauge2 *pGauge, cairo_t *pSourceContext) +{ + //g_print ("%s (%dx%d)\n", __func__, iWidth, iHeight); + g_return_if_fail (pGauge != NULL); + + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + int iWidth = pGauge->dataRenderer.iWidth, iHeight = pGauge->dataRenderer.iHeight; + if (pGauge->pImageBackground != NULL) + { + _cairo_dock_load_gauge_image (pSourceContext, pGauge->pImageBackground, iWidth, iHeight); + } + + if (pGauge->pImageForeground != NULL) + { + _cairo_dock_load_gauge_image (pSourceContext, pGauge->pImageForeground, iWidth, iHeight); + } + + GaugeIndicator2 *pGaugeIndicator2; + GaugeImage2 *pGaugeImage2; + int i; + GList *pElement, *pElement2; + for (pElement = pGauge->pIndicatorList; pElement != NULL; pElement = pElement->next) + { + pGaugeIndicator2 = pElement->data; + for (i = 0; i < pGaugeIndicator2->iNbImages; i ++) + { + pGaugeImage2 = &pGaugeIndicator2->pImageList[i]; + _cairo_dock_load_gauge_image (pSourceContext, pGaugeImage2, iWidth, iHeight); + } + if (g_bUseOpenGL && pGaugeIndicator2->pImageNeedle) + { + _cairo_dock_load_gauge_needle (pSourceContext, pGaugeIndicator2, iWidth, iHeight); + } + } +} + + //////////////////////////////////////////// + /////////////// FREE GAUGE ///////////////// +//////////////////////////////////////////// +static void _cairo_dock_free_gauge_image(GaugeImage2 *pGaugeImage2, gboolean bFree) +{ + if (pGaugeImage2 == NULL) + return ; + cd_debug(""); + + if(pGaugeImage2->pSvgHandle != NULL) + rsvg_handle_free (pGaugeImage2->pSvgHandle); + if(pGaugeImage2->pSurface != NULL) + cairo_surface_destroy (pGaugeImage2->pSurface); + if (pGaugeImage2->iTexture != 0) + glDeleteTextures (1, &pGaugeImage2->iTexture); + + if (bFree) + g_free (pGaugeImage2); +} +static void _cairo_dock_free_gauge_indicator(GaugeIndicator2 *pGaugeIndicator2) +{ + if (pGaugeIndicator2 == NULL) + return ; + cd_debug(""); + + int i; + for (i = 0; i < pGaugeIndicator2->iNbImages; i ++) + { + _cairo_dock_free_gauge_image (&pGaugeIndicator2->pImageList[i], FALSE); + } + g_free (pGaugeIndicator2->pImageList); + + _cairo_dock_free_gauge_image (pGaugeIndicator2->pImageNeedle, TRUE); + + g_free (pGaugeIndicator2); +} +void cairo_dock_free_gauge2 (Gauge2 *pGauge) +{ + cd_debug(""); + if(pGauge == NULL) + return ; + + _cairo_dock_free_gauge_image(pGauge->pImageBackground, TRUE); + _cairo_dock_free_gauge_image(pGauge->pImageForeground, TRUE); + + GList *pElement; + for (pElement = pGauge->pIndicatorList; pElement != NULL; pElement = pElement->next) + { + _cairo_dock_free_gauge_indicator (pElement->data); + } + g_list_free (pGauge->pIndicatorList); + + g_free (pGauge); +} + + +void cairo_dock_add_watermark_on_gauge2 (cairo_t *pSourceContext, Gauge2 *pGauge, gchar *cImagePath, double fAlpha) +{ + g_return_if_fail (pGauge != NULL && cImagePath != NULL); + + CairoDataRenderer *pRenderer = CAIRO_DATA_RENDERER (pGauge); + cairo_surface_t *pWatermarkSurface = cairo_dock_create_surface_for_icon (cImagePath, pSourceContext, pRenderer->iWidth/2, pRenderer->iHeight/2); + + if (pGauge->pImageBackground == NULL) + { + pGauge->pImageBackground = g_new0 (GaugeImage2, 1); + pGauge->pImageBackground->sizeX = pRenderer->iWidth; + pGauge->pImageBackground->sizeY = pRenderer->iHeight; + + pGauge->pImageBackground->pSurface = cairo_surface_create_similar (cairo_get_target (pSourceContext), + CAIRO_CONTENT_COLOR_ALPHA, + pRenderer->iWidth, + pRenderer->iHeight); + } + + cairo_t *pCairoContext = cairo_create (pGauge->pImageBackground->pSurface); + cairo_set_operator (pCairoContext, CAIRO_OPERATOR_OVER); + + cairo_set_source_surface (pCairoContext, pWatermarkSurface, pRenderer->iWidth/4, pRenderer->iHeight/4); + cairo_paint_with_alpha (pCairoContext, fAlpha); + + cairo_destroy (pCairoContext); + + cairo_surface_destroy (pWatermarkSurface); +} + + ////////////////////////////////////////// + /////////////// RENDERER ///////////////// +////////////////////////////////////////// +Gauge2 *cairo_dock_new_gauge (void) +{ + Gauge2 *pGauge = g_new0 (Gauge2, 1); + pGauge->dataRenderer.interface.new = cairo_dock_new_gauge; + pGauge->dataRenderer.interface.load = cairo_dock_load_gauge2; + pGauge->dataRenderer.interface.render = cairo_dock_render_gauge2; + pGauge->dataRenderer.interface.render_opengl = cairo_dock_render_gauge_opengl2; + pGauge->dataRenderer.interface.free = cairo_dock_free_gauge2; + pGauge->dataRenderer.interface.reload = cairo_dock_reload_gauge2; + return pGauge; +} + + ///////////////////////////////////////////////// + /////////////// LIST OF THEMES ///////////////// +///////////////////////////////////////////////// +/*GHashTable *cairo_dock_list_available_gauges (void) +{ + gchar *cGaugeShareDir = g_strdup_printf ("%s/%s", CAIRO_DOCK_SHARE_DATA_DIR, CAIRO_DOCK_GAUGES_DIR); + gchar *cGaugeUserDir = g_strdup_printf ("%s/%s/%s", g_cCairoDockDataDir, CAIRO_DOCK_EXTRAS_DIR, CAIRO_DOCK_GAUGES_DIR); + GHashTable *pGaugeTable = cairo_dock_list_themes (cGaugeShareDir, cGaugeUserDir, CAIRO_DOCK_GAUGES_DIR); + + g_free (cGaugeShareDir); + g_free (cGaugeUserDir); + return pGaugeTable; +} + +const gchar *cairo_dock_get_gauge_key_value(gchar *cAppletConfFilePath, GKeyFile *pKeyFile, gchar *cGroupName, gchar *cKeyName, gboolean *bFlushConfFileNeeded, gchar *cDefaultThemeName) +{ + gchar *cChosenThemeName = cairo_dock_get_string_key_value (pKeyFile, cGroupName, cKeyName, bFlushConfFileNeeded, cDefaultThemeName, NULL, NULL); + gchar *cGaugeShareDir = g_strdup_printf ("%s/%s", CAIRO_DOCK_SHARE_DATA_DIR, CAIRO_DOCK_GAUGES_DIR); + gchar *cGaugeUserDir = g_strdup_printf ("%s/%s/%s", g_cCairoDockDataDir, CAIRO_DOCK_EXTRAS_DIR, CAIRO_DOCK_GAUGES_DIR); + gchar *cGaugePath = cairo_dock_get_theme_path (cChosenThemeName, cGaugeShareDir, cGaugeUserDir, CAIRO_DOCK_GAUGES_DIR); + g_free (cGaugeShareDir); + g_free (cGaugeUserDir); + + cd_debug ("Theme de la jauge : %s", cGaugePath); + return cGaugePath; +} +*/ diff -Nru cairo-dock-2.0.3/src/cairo-dock-gauge2.h cairo-dock-2.0.5/src/cairo-dock-gauge2.h --- cairo-dock-2.0.3/src/cairo-dock-gauge2.h 1970-01-01 01:00:00.000000000 +0100 +++ cairo-dock-2.0.5/src/cairo-dock-gauge2.h 2009-06-10 01:19:02.000000000 +0200 @@ -0,0 +1,75 @@ + +#ifndef __CAIRO_DOCK_GAUGE2__ +#define __CAIRO_DOCK_GAUGE2__ + +#include "cairo-dock-struct.h" +#include +#include +#include +G_BEGIN_DECLS + +typedef struct { + RsvgHandle *pSvgHandle; + cairo_surface_t *pSurface; + gint sizeX; + gint sizeY; + GLuint iTexture; +} GaugeImage2; + +typedef struct { + // needle + gdouble posX, posY; + gdouble posStart, posStop; + gdouble direction; + gint iNeedleRealWidth, iNeedleRealHeight; + gdouble iNeedleOffsetX, iNeedleOffsetY; + gdouble fNeedleScale; + gint iNeedleWidth, iNeedleHeight; + GaugeImage2 *pImageNeedle; + // image list + gint iNbImages; + gint iNbImageLoaded; + GaugeImage2 *pImageList; + // text zone + gdouble textX, textY; + gdouble textWidth, textHeight; + gdouble textColor[3]; +} GaugeIndicator2; + +typedef struct { + CairoDataRenderer dataRenderer; + gchar *cThemeName; + GaugeImage2 *pImageBackground; + GaugeImage2 *pImageForeground; + GList *pIndicatorList; +} Gauge2; + +typedef struct _CairoGaugeAttribute CairoGaugeAttribute; +struct _CairoGaugeAttribute { + CairoDataRendererAttribute rendererAttribute; + gchar *cThemePath; +}; + + +void cairo_dock_xml_open_file2 (const gchar *filePath, const gchar *mainNodeName,xmlDocPtr *xmlDoc,xmlNodePtr *node); + +void cairo_dock_render_gauge2 (Gauge2 *pGauge, cairo_t *pCairoContext); + +void cairo_dock_render_gauge_opengl2 (Gauge2 *pGauge); + +void cairo_dock_reload_gauge2 (Gauge2 *pGauge, cairo_t *pSourceContext); + +void cairo_dock_free_gauge2 (Gauge2 *pGauge); + +void cairo_dock_add_watermark_on_gauge2 (cairo_t *pSourceContext, Gauge2 *pGauge, gchar *cImagePath, double fAlpha); + +Gauge2 *cairo_dock_new_gauge (void); + + +GHashTable *cairo_dock_list_available_gauges2 (void); + +const gchar *cairo_dock_get_gauge_key_value2 (gchar *cAppletConfFilePath, GKeyFile *pKeyFile, gchar *cGroupName, gchar *cKeyName, gboolean *bFlushConfFileNeeded, gchar *cDefaultThemeName); + + +G_END_DECLS +#endif diff -Nru cairo-dock-2.0.3/src/cairo-dock-global-variables.h cairo-dock-2.0.5/src/cairo-dock-global-variables.h --- cairo-dock-2.0.3/src/cairo-dock-global-variables.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-global-variables.h 2009-06-10 02:29:42.000000000 +0200 @@ -44,7 +44,7 @@ extern gboolean g_bEasterEggs; -extern int g_iBackgroundTexture; +extern GLuint g_iBackgroundTexture; extern gboolean g_bUseOpenGL; G_END_DECLS diff -Nru cairo-dock-2.0.3/src/cairo-dock-gui-factory.c cairo-dock-2.0.5/src/cairo-dock-gui-factory.c --- cairo-dock-2.0.3/src/cairo-dock-gui-factory.c 2009-05-20 21:14:04.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-gui-factory.c 2009-06-10 01:18:57.000000000 +0200 @@ -693,12 +693,12 @@ GtkWindow *pDialog = data[1]; gchar *cModuleName = data[2]; - CairoDockGroupDescription *pGroupDescription = cairo_dock_find_module_description (cModuleName); - + CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName); + Icon *pIcon = cairo_dock_get_current_active_icon (); CairoDock *pDock = cairo_dock_search_dock_from_name (pIcon != NULL ? pIcon->cParentDockName : NULL); gchar *cMessage = NULL; - if (pGroupDescription == NULL) + if (pModule == NULL) { cMessage = g_strdup_printf (_("The '%s' plug-in was not found.\nBe sure to install it in the same version as the dock to enjoy these features."), cModuleName); int iDuration = 10e3; @@ -709,6 +709,13 @@ } else { + CairoDockGroupDescription *pGroupDescription = cairo_dock_find_module_description (cModuleName); + if (pGroupDescription == NULL) + { + cairo_dock_build_main_ihm (g_cConfFile, FALSE); + pGroupDescription = cairo_dock_find_module_description (cModuleName); + g_return_if_fail (pGroupDescription != NULL); + } CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName); if (pModule != NULL && pModule->pInstancesList == NULL) { @@ -1348,10 +1355,9 @@ pPreviewImage = NULL; length = 0; GdkPixbuf *pixbuf; - cValueList = g_key_file_get_locale_string_list (pKeyFile, cGroupName, cKeyName, NULL, &length, NULL); if (iNbElements == 1) { - cValue = (0 < length ? cValueList[0] : ""); + cValue = g_key_file_get_locale_string (pKeyFile, cGroupName, cKeyName, NULL, NULL); // nous permet de recuperer les ';' aussi. if (pAuthorizedValuesList == NULL) { pOneWidget = gtk_entry_new (); @@ -1446,9 +1452,11 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (pOneWidget), iSelectedItem); } _pack_subwidget (pOneWidget); + g_free (cValue); } - else + else // valeurs multiples. { + cValueList = g_key_file_get_locale_string_list (pKeyFile, cGroupName, cKeyName, NULL, &length, NULL); pOneWidget = gtk_tree_view_new (); modele = _allocate_new_model (); gtk_tree_view_set_model (GTK_TREE_VIEW (pOneWidget), GTK_TREE_MODEL (modele)); @@ -1650,6 +1658,7 @@ data[0] = pOneWidget; data[1] = pEntry; } + g_strfreev (cValueList); } if (iElementType == 'S' || iElementType == 'D' || iElementType == 'u') @@ -1720,7 +1729,6 @@ _pack_in_widget_box (pGrabKeyButton); } - g_strfreev (cValueList); break; case 'F' : // frame. diff -Nru cairo-dock-2.0.3/src/cairo-dock-gui-manager.c cairo-dock-2.0.5/src/cairo-dock-gui-manager.c --- cairo-dock-2.0.3/src/cairo-dock-gui-manager.c 2009-05-21 02:13:26.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-gui-manager.c 2009-06-10 01:19:11.000000000 +0200 @@ -60,6 +60,7 @@ static GtkWidget *s_pGroupFrame = NULL; static GtkWidget *s_pFilterEntry = NULL; static GtkWidget *s_pActivateButton = NULL; +static GtkWidget *s_pStatusBar = NULL; static GSList *s_path = NULL; static int s_iPreviewWidth, s_iNbButtonsByRow; @@ -367,7 +368,7 @@ FALSE, 0); - GtkWidget *pVBox = gtk_vbox_new (FALSE, CAIRO_DOCK_TABLE_MARGIN); + GtkWidget *pVBox = gtk_vbox_new (FALSE, 0*CAIRO_DOCK_TABLE_MARGIN); gtk_box_pack_start (GTK_BOX (pMainHBox), pVBox, TRUE, @@ -620,8 +621,16 @@ FALSE, 0); + //\_____________ On ajoute la barre de status a la fin. + s_pStatusBar = gtk_statusbar_new (); + gtk_box_pack_end (GTK_BOX (pVBox), /// pButtonsHBox ?... + s_pStatusBar, + FALSE, + FALSE, + 0); + //\_____________ On ajoute les boutons. - GtkWidget *pButtonsHBox = gtk_hbox_new (FALSE, CAIRO_DOCK_GUI_MARGIN*3); + GtkWidget *pButtonsHBox = gtk_hbox_new (FALSE, CAIRO_DOCK_GUI_MARGIN); gtk_box_pack_end (GTK_BOX (pVBox), pButtonsHBox, FALSE, @@ -953,7 +962,7 @@ gtk_window_set_title (GTK_WINDOW (cairo_dock_get_main_window ()), gettext (pGroupDescription->cGroupName)); - //\_______________ On met a jour la frame du groupe (label + check-button).g + //\_______________ On met a jour la frame du groupe (label + check-button). GtkWidget *pLabel = gtk_label_new (NULL); gchar *cLabel = g_strdup_printf ("%s", pGroupDescription->cGroupName); gtk_label_set_markup (GTK_LABEL (pLabel), cLabel); @@ -1131,6 +1140,7 @@ s_pMainWindow = NULL; s_pToolBar = NULL; + s_pStatusBar = NULL; if (s_pCurrentGroup != NULL) { @@ -1180,7 +1190,7 @@ -gboolean cairo_dock_build_normal_gui (gchar *cConfFilePath, const gchar *cGettextDomain, const gchar *cTitle, int iWidth, int iHeight, CairoDockApplyConfigFunc pAction, gpointer pUserData, GFreeFunc pFreeUserData) +gboolean cairo_dock_build_normal_gui (gchar *cConfFilePath, const gchar *cGettextDomain, const gchar *cTitle, int iWidth, int iHeight, CairoDockApplyConfigFunc pAction, gpointer pUserData, GFreeFunc pFreeUserData, GtkWidget **pWindow) { //\_____________ On construit la fenetre. GtkWidget *pMainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -1208,6 +1218,15 @@ FALSE, 0); + //\_____________ On ajoute la barre d'etat a la fin. + GtkWidget *pStatusBar = gtk_statusbar_new (); + gtk_box_pack_end (GTK_BOX (pMainVBox), /// pButtonsHBox ?... + pStatusBar, + FALSE, + FALSE, + 0); + g_object_set_data (G_OBJECT (pMainWindow), "status-bar", pStatusBar); + //\_____________ On ajoute les boutons. GtkWidget *pButtonsHBox = gtk_hbox_new (FALSE, CAIRO_DOCK_GUI_MARGIN*2); gtk_box_pack_end (GTK_BOX (pMainVBox), @@ -1237,12 +1256,12 @@ else { GtkWidget *pOkButton = gtk_button_new_from_stock (GTK_STOCK_OK); - g_signal_connect (G_OBJECT (pOkButton), "clicked", G_CALLBACK(on_click_normal_ok), pMainWindow); - gtk_box_pack_end (GTK_BOX (pButtonsHBox), - pOkButton, - FALSE, - FALSE, - 0); + g_signal_connect (G_OBJECT (pOkButton), "clicked", G_CALLBACK(on_click_normal_ok), pMainWindow); + gtk_box_pack_end (GTK_BOX (pButtonsHBox), + pOkButton, + FALSE, + FALSE, + 0); } gtk_window_resize (GTK_WINDOW (pMainWindow), iWidth, iHeight); @@ -1263,6 +1282,8 @@ "delete-event", G_CALLBACK (on_delete_normal_gui), NULL); + if (pWindow) + *pWindow = pMainWindow; } else // on bloque. { @@ -1284,6 +1305,8 @@ iResult = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (pMainWindow), "result")); cd_debug ("iResult : %d", iResult); gtk_widget_destroy (pMainWindow); + if (pWindow) + *pWindow = NULL; } return iResult; @@ -1460,3 +1483,29 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (pOneWidget), y); } } + +void cairo_dock_set_status_message (GtkWidget *pWindow, const gchar *cMessage) +{ + GtkWidget *pStatusBar; + if (pWindow == NULL) + pStatusBar = s_pStatusBar; + else + pStatusBar = g_object_get_data (G_OBJECT (pWindow), "status-bar"); + if (pStatusBar == NULL) + return ; + g_print ("%s (%s sur %x/%x)\n", __func__, cMessage, pWindow, pStatusBar); + gtk_statusbar_pop (GTK_STATUSBAR (pStatusBar), 0); // clear any previous message, underflow is allowed. + gtk_statusbar_push (GTK_STATUSBAR (pStatusBar), 0, cMessage); +} +void cairo_dock_set_status_message_printf (GtkWidget *pWindow, const gchar *cFormat, ...) +{ + if (pWindow == NULL && s_pStatusBar == NULL) + return ; + g_return_if_fail (cFormat != NULL); + va_list args; + va_start (args, cFormat); + gchar *cMessage = g_strdup_vprintf (cFormat, args); + cairo_dock_set_status_message (pWindow, cMessage); + g_free (cMessage); + va_end (args); +} diff -Nru cairo-dock-2.0.3/src/cairo-dock-gui-manager.h cairo-dock-2.0.5/src/cairo-dock-gui-manager.h --- cairo-dock-2.0.3/src/cairo-dock-gui-manager.h 2009-05-21 02:37:54.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-gui-manager.h 2009-06-10 01:19:01.000000000 +0200 @@ -69,7 +69,7 @@ void cairo_dock_write_extra_group_conf_file (gchar *cConfFilePath, CairoDockModuleInstance *pInstance, int iNumExtraModule); -gboolean cairo_dock_build_normal_gui (gchar *cConfFilePath, const gchar *cGettextDomain, const gchar *cTitle, int iWidth, int iHeight, CairoDockApplyConfigFunc pAction, gpointer pUserData, GFreeFunc pFreeUserData); +gboolean cairo_dock_build_normal_gui (gchar *cConfFilePath, const gchar *cGettextDomain, const gchar *cTitle, int iWidth, int iHeight, CairoDockApplyConfigFunc pAction, gpointer pUserData, GFreeFunc pFreeUserData, GtkWidget **pWindow); gpointer cairo_dock_get_previous_widget (void); @@ -101,6 +101,9 @@ void cairo_dock_update_desklet_size_in_gui (const gchar *cModuleName, int iWidth, int iHeight); void cairo_dock_update_desklet_position_in_gui (const gchar *cModuleName, int x, int y); +void cairo_dock_set_status_message (GtkWidget *pWindow, const gchar *cMessage); +void cairo_dock_set_status_message_printf (GtkWidget *pWindow, const gchar *cFormat, ...); + G_END_DECLS #endif diff -Nru cairo-dock-2.0.3/src/cairo-dock.h cairo-dock-2.0.5/src/cairo-dock.h --- cairo-dock-2.0.3/src/cairo-dock.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock.h 2009-06-10 01:19:00.000000000 +0200 @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff -Nru cairo-dock-2.0.3/src/cairo-dock-icons.c cairo-dock-2.0.5/src/cairo-dock-icons.c --- cairo-dock-2.0.3/src/cairo-dock-icons.c 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-icons.c 2009-06-10 01:18:58.000000000 +0200 @@ -426,8 +426,8 @@ void cairo_dock_get_icon_extent (Icon *pIcon, CairoContainer *pContainer, int *iWidth, int *iHeight) { double fMaxScale = cairo_dock_get_max_scale (pContainer); - double fRatio = (CAIRO_DOCK_IS_DESKLET (pContainer) ? 1. : pContainer->fRatio); // on ne tient pas compte de l'effet de zoom initial du desklet. - if (pContainer->bIsHorizontal) + double fRatio = (CAIRO_DOCK_IS_DOCK (pContainer) ? pContainer->fRatio : 1.); // on ne tient pas compte de l'effet de zoom initial du desklet. + if (!pContainer || pContainer->bIsHorizontal) { *iWidth = (int) (pIcon->fWidth / fRatio * fMaxScale); *iHeight = (int) (pIcon->fHeight / fRatio * fMaxScale); @@ -489,14 +489,14 @@ { pArea->x = (int) floor (fX); pArea->y = (int) floor (fY); - pArea->width = (int) ceil (icon->fWidth * icon->fScale * fabs (icon->fWidthFactor)) + 0; + pArea->width = (int) ceil (icon->fWidth * icon->fScale * fabs (icon->fWidthFactor)) + 1; pArea->height = (int) ceil (icon->fHeight * icon->fScale * fabs (icon->fHeightFactor) + fReflectSize); } else { pArea->x = (int) floor (fY); pArea->y = (int) floor (fX); - pArea->width = ((int) ceil (icon->fHeight * icon->fScale * fabs (icon->fHeightFactor) + fReflectSize)) + 0; + pArea->width = ((int) ceil (icon->fHeight * icon->fScale * fabs (icon->fHeightFactor) + fReflectSize)) + 1; pArea->height = (int) ceil (icon->fWidth * icon->fScale * fabs (icon->fWidthFactor)); } //g_print ("redraw : %d;%d %dx%d\n", pArea->x, pArea->y, pArea->width,pArea->height); diff -Nru cairo-dock-2.0.3/src/cairo-dock-icons.h cairo-dock-2.0.5/src/cairo-dock-icons.h --- cairo-dock-2.0.3/src/cairo-dock-icons.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-icons.h 2009-06-10 01:19:02.000000000 +0200 @@ -44,6 +44,11 @@ */ #define CAIRO_DOCK_IS_FAKE_LAUNCHER(icon) (CAIRO_DOCK_IS_LAUNCHER (icon) && (icon)->acCommand == NULL && (icon)->cClass != NULL) /** +*TRUE ssi l'icone est une icone pointant sur le sous-dock d'une classe d'appli. +*@param icon une icone. +*/ +#define CAIRO_DOCK_IS_MULTI_APPLI(icon) (CAIRO_DOCK_IS_LAUNCHER (icon) && icon->pSubDock != NULL && icon->pSubDock->icons != NULL && icon->cClass != NULL) +/** *TRUE ssi l'icone est une icone de separateur ajoutee automatiquement. *@param icon une icone. */ @@ -205,14 +210,14 @@ *@param list la liste d'icones. *@return l'element suivant de la liste bouclee. */ -#define cairo_dock_get_next_element(ic, list) (ic->next == NULL ? list : ic->next) +#define cairo_dock_get_next_element(ic, list) (ic == NULL || ic->next == NULL ? list : ic->next) /** *Renvoie l'element precedent dans la liste, en bouclant si necessaire. *@param ic l'element courant. *@param list la liste d'icones. *@return l'element precedent de la liste bouclee. */ -#define cairo_dock_get_previous_element(ic, list) (ic->prev == NULL ? g_list_last (list) : ic->prev) +#define cairo_dock_get_previous_element(ic, list) (ic == NULL || ic->prev == NULL ? g_list_last (list) : ic->prev) /** *Cherche l'icone ayant une commande donnee parmi une liste d'icones. *@param pIconList la liste d'icones. diff -Nru cairo-dock-2.0.3/src/cairo-dock-internal-icons.c cairo-dock-2.0.5/src/cairo-dock-internal-icons.c --- cairo-dock-2.0.3/src/cairo-dock-internal-icons.c 2009-05-20 20:29:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-internal-icons.c 2009-06-10 01:19:04.000000000 +0200 @@ -276,7 +276,8 @@ gboolean bIconBackgroundImagesChanged = FALSE; // if background images are different, reload them and trigger the reload of all icons - if (cairo_dock_strings_differ (pPrevIcons->cBackgroundImagePath, pIcons->cBackgroundImagePath)) + if (cairo_dock_strings_differ (pPrevIcons->cBackgroundImagePath, pIcons->cBackgroundImagePath) || + pPrevIcons->fAmplitude != pIcons->fAmplitude) { bIconBackgroundImagesChanged = TRUE; cairo_dock_load_icons_background_surface (pIcons->cBackgroundImagePath, pCairoContext, fMaxScale); @@ -313,7 +314,8 @@ } if (pPrevIcons->tIconAuthorizedWidth[CAIRO_DOCK_LAUNCHER] != pIcons->tIconAuthorizedWidth[CAIRO_DOCK_LAUNCHER] || - pPrevIcons->tIconAuthorizedHeight[CAIRO_DOCK_LAUNCHER] != pIcons->tIconAuthorizedHeight[CAIRO_DOCK_LAUNCHER]) + pPrevIcons->tIconAuthorizedHeight[CAIRO_DOCK_LAUNCHER] != pIcons->tIconAuthorizedHeight[CAIRO_DOCK_LAUNCHER] || + pPrevIcons->fAmplitude != pIcons->fAmplitude) { cairo_dock_load_active_window_indicator (pCairoContext, myIndicators.cActiveIndicatorImagePath, @@ -321,6 +323,15 @@ myIndicators.iActiveCornerRadius, myIndicators.iActiveLineWidth, myIndicators.fActiveColor); + if (myTaskBar.bShowAppli && myTaskBar.bGroupAppliByClass) + cairo_dock_load_class_indicator (myIndicators.cClassIndicatorImagePath, + pCairoContext, + fMaxScale); + if (myTaskBar.bShowAppli && myTaskBar.bMixLauncherAppli) + cairo_dock_load_task_indicator (myIndicators.cIndicatorImagePath, + pCairoContext, + fMaxScale, + myIndicators.fIndicatorRatio); } g_fBackgroundImageWidth = g_fBackgroundImageHeight = 0.; diff -Nru cairo-dock-2.0.3/src/cairo-dock-internal-position.c cairo-dock-2.0.5/src/cairo-dock-internal-position.c --- cairo-dock-2.0.3/src/cairo-dock-internal-position.c 2009-05-23 00:57:50.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-internal-position.c 2009-06-10 01:18:56.000000000 +0200 @@ -74,11 +74,12 @@ pDock->bDirectionUp = FALSE; break; } + cairo_dock_update_dock_size (pDock); // si bHorizonalDock a change, la taille max a change aussi. cairo_dock_synchronize_sub_docks_position (pDock, FALSE); cairo_dock_reload_buffers_in_all_docks (TRUE); } - - cairo_dock_update_dock_size (pDock); // si bHorizonalDock a change, ou si l'ecran a change, la taille max a change aussi. + else + cairo_dock_update_dock_size (pDock); // si l'ecran a change, la taille max a change aussi. pDock->iGapX = pPosition->iGapX; pDock->iGapY = pPosition->iGapY; diff -Nru cairo-dock-2.0.3/src/cairo-dock-launcher-factory.c cairo-dock-2.0.5/src/cairo-dock-launcher-factory.c --- cairo-dock-2.0.3/src/cairo-dock-launcher-factory.c 2009-05-23 01:21:31.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-launcher-factory.c 2009-06-10 01:19:02.000000000 +0200 @@ -67,7 +67,8 @@ if (cSuffixTab[j] == NULL) bAddSuffix = TRUE;*/ - bAddSuffix = (strchr (cFileName, '.') == NULL); + gchar *str = strrchr (cFileName, '.'); + bAddSuffix = (str == NULL || ! g_ascii_isalpha (*(str+1))); //\_______________________ On parcourt les repertoires disponibles, en testant tous les suffixes connus. i = 0; diff -Nru cairo-dock-2.0.3/src/cairo-dock-load.c cairo-dock-2.0.5/src/cairo-dock-load.c --- cairo-dock-2.0.3/src/cairo-dock-load.c 2009-05-22 02:24:47.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-load.c 2009-06-10 02:31:36.000000000 +0200 @@ -43,6 +43,8 @@ #include "cairo-dock-internal-icons.h" #include "cairo-dock-internal-views.h" #include "cairo-dock-container.h" +#include "cairo-dock-desklet.h" +#include "cairo-dock-dialogs.h" #include "cairo-dock-load.h" extern CairoDock *g_pMainDock; @@ -71,10 +73,12 @@ extern double g_iIconBackgroundImageWidth, g_iIconBackgroundImageHeight; extern cairo_surface_t *g_pDesktopBgSurface; +extern GLuint g_pGradationTexture[2]; extern gboolean g_bUseOpenGL; extern gboolean g_bEasterEggs; extern GLuint g_iBackgroundTexture; +extern GLuint g_iVisibleZoneTexture; extern GLuint g_iIndicatorTexture; extern GLuint g_iActiveIndicatorTexture; extern GLuint g_iDesktopBgTexture; @@ -233,7 +237,7 @@ } if (icon->iIconTexture != 0) { - glDeleteTextures (1, &icon->iIconTexture); + _cairo_dock_delete_texture (icon->iIconTexture); icon->iIconTexture = 0; } if (icon->pReflectionBuffer != NULL) @@ -307,6 +311,25 @@ icon->pIconBuffer = cairo_dock_create_surface_from_xpixmap (icon->iBackingPixmap, pSourceContext, fMaxScale, &icon->fWidth, &icon->fHeight); if (icon->pIconBuffer == NULL) icon->pIconBuffer = cairo_dock_create_surface_from_xwindow (icon->Xid, pSourceContext, fMaxScale, &icon->fWidth, &icon->fHeight); + if (icon->pIconBuffer == NULL) + { + gchar *cIconPath = cairo_dock_generate_file_path (CAIRO_DOCK_DEFAULT_APPLI_ICON_NAME); + if (cIconPath == NULL || ! g_file_test (cIconPath, G_FILE_TEST_EXISTS)) + { + g_free (cIconPath); + cIconPath = g_strdup (CAIRO_DOCK_SHARE_DATA_DIR"/"CAIRO_DOCK_DEFAULT_APPLI_ICON_NAME); + } + icon->pIconBuffer = cairo_dock_create_surface_from_image (cIconPath, + pSourceContext, + fMaxScale, + myIcons.tIconAuthorizedWidth[CAIRO_DOCK_APPLI], + myIcons.tIconAuthorizedHeight[CAIRO_DOCK_APPLI], + CAIRO_DOCK_FILL_SPACE, + (bHorizontalDock ? &icon->fWidth : &icon->fHeight), + (bHorizontalDock ? &icon->fHeight : &icon->fWidth), + NULL, NULL); + g_free (cIconPath); + } } else // c'est une icone de separation. { @@ -434,7 +457,7 @@ icon->pTextBuffer = NULL; if (icon->iLabelTexture != 0) { - glDeleteTextures (1, &icon->iLabelTexture); + _cairo_dock_delete_texture (icon->iLabelTexture); icon->iLabelTexture = 0; } if (icon->acName == NULL || (pTextDescription->iSize == 0)) @@ -468,7 +491,7 @@ icon->pQuickInfoBuffer = NULL; if (icon->iQuickInfoTexture != 0) { - glDeleteTextures (1, &icon->iQuickInfoTexture); + _cairo_dock_delete_texture (icon->iQuickInfoTexture); icon->iQuickInfoTexture = 0; } if (icon->cQuickInfo == NULL) @@ -530,19 +553,19 @@ { icon = ic->data; - icon->fWidth /= pDock->fRatio; - icon->fHeight /= pDock->fRatio; if (CAIRO_DOCK_IS_APPLET (icon)) { - if (bReloadAppletsToo) + if (bReloadAppletsToo) /// modif du 23/05/2009 : utiliser la taille avec ratio ici. les applets doivent faire attention a utiliser la fonction get_icon_extent(). cairo_dock_reload_module_instance (icon->pModuleInstance, FALSE); } else { + icon->fWidth /= pDock->fRatio; + icon->fHeight /= pDock->fRatio; cairo_dock_fill_icon_buffers_for_dock (icon, pCairoContext, pDock); + icon->fWidth *= pDock->fRatio; + icon->fHeight *= pDock->fRatio; } - icon->fWidth *= pDock->fRatio; - icon->fHeight *= pDock->fRatio; //g_print (" =size <- %.2fx%.2f\n", icon->fWidth, icon->fHeight); fFlatDockWidth += myIcons.iIconGap + icon->fWidth; @@ -737,7 +760,7 @@ if (g_bUseOpenGL) { if (g_iBackgroundTexture != 0) - glDeleteTextures (1, &g_iBackgroundTexture); + _cairo_dock_delete_texture (g_iBackgroundTexture); g_iBackgroundTexture = cairo_dock_create_texture_from_surface (g_pBackgroundSurfaceFull != NULL ? g_pBackgroundSurfaceFull : g_pBackgroundSurface); } @@ -876,7 +899,7 @@ } if (g_iDesktopBgTexture != 0) { - glDeleteTextures (1, &g_iDesktopBgTexture); + _cairo_dock_delete_texture (g_iDesktopBgTexture); g_iDesktopBgTexture = 0; } } @@ -899,7 +922,7 @@ } if (g_iIndicatorTexture != 0) { - glDeleteTextures (1, &g_iIndicatorTexture); + _cairo_dock_delete_texture (g_iIndicatorTexture); g_iIndicatorTexture = 0; } if (cIndicatorImagePath != NULL) @@ -931,7 +954,7 @@ } if (g_iActiveIndicatorTexture != 0) { - glDeleteTextures (1, &g_iActiveIndicatorTexture); + _cairo_dock_delete_texture (g_iActiveIndicatorTexture); g_iActiveIndicatorTexture = 0; } g_fActiveIndicatorWidth = MAX (myIcons.tIconAuthorizedWidth[CAIRO_DOCK_LAUNCHER], myIcons.tIconAuthorizedWidth[CAIRO_DOCK_APPLI]); @@ -985,7 +1008,7 @@ } if (g_iClassIndicatorTexture != 0) { - glDeleteTextures (1, &g_iClassIndicatorTexture); + _cairo_dock_delete_texture (g_iClassIndicatorTexture); g_iClassIndicatorTexture = 0; } if (cIndicatorImagePath != NULL) @@ -1007,3 +1030,45 @@ NULL, NULL); } } + + +void cairo_dock_unload_additionnal_textures (void) +{ + if (g_iBackgroundTexture != 0) + { + _cairo_dock_delete_texture (g_iBackgroundTexture); + g_iBackgroundTexture = 0; + } + if (g_iVisibleZoneTexture != 0) + { + _cairo_dock_delete_texture (g_iVisibleZoneTexture); + g_iVisibleZoneTexture = 0; + } + if (g_iIndicatorTexture != 0) + { + _cairo_dock_delete_texture (g_iIndicatorTexture); + g_iIndicatorTexture = 0; + } + if (g_iActiveIndicatorTexture != 0) + { + _cairo_dock_delete_texture (g_iActiveIndicatorTexture); + g_iActiveIndicatorTexture = 0; + } + if (g_iClassIndicatorTexture != 0) + { + _cairo_dock_delete_texture (g_iClassIndicatorTexture); + g_iClassIndicatorTexture = 0; + } + cairo_dock_unload_desklet_buttons_texture (); + cairo_dock_unload_dialog_buttons (); + if (g_pGradationTexture[0] != 0) + { + _cairo_dock_delete_texture (g_pGradationTexture[0]); + g_pGradationTexture[0] = 0; + } + if (g_pGradationTexture[1] != 0) + { + _cairo_dock_delete_texture (g_pGradationTexture[1]); + g_pGradationTexture[1] = 0; + } +} diff -Nru cairo-dock-2.0.3/src/cairo-dock-load.h cairo-dock-2.0.5/src/cairo-dock-load.h --- cairo-dock-2.0.3/src/cairo-dock-load.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-load.h 2009-06-10 01:18:59.000000000 +0200 @@ -89,5 +89,8 @@ void cairo_dock_load_class_indicator (const gchar *cIndicatorImagePath, cairo_t* pSourceContext, double fMaxScale); +void cairo_dock_unload_additionnal_textures (void); + + G_END_DECLS #endif diff -Nru cairo-dock-2.0.3/src/cairo-dock-menu.c cairo-dock-2.0.5/src/cairo-dock-menu.c --- cairo-dock-2.0.3/src/cairo-dock-menu.c 2009-05-20 22:07:38.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-menu.c 2009-06-10 01:32:25.000000000 +0200 @@ -42,6 +42,7 @@ #include "cairo-dock-gui-manager.h" #include "cairo-dock-internal-icons.h" #include "cairo-dock-internal-accessibility.h" +#include "cairo-dock-container.h" #include "cairo-dock-menu.h" #define CAIRO_DOCK_CONF_PANEL_WIDTH 800 @@ -80,11 +81,7 @@ Icon *icon = data[0]; CairoDock *pDock = data[1]; - gboolean bRefreshGUI; - do - { - bRefreshGUI = cairo_dock_manage_themes (pDock->pWidget, 0); - } while (bRefreshGUI); + cairo_dock_manage_themes (); } @@ -220,8 +217,20 @@ static void _cairo_dock_quit (GtkMenuItem *pMenuItem, gpointer *data) { - CairoDock *pDock = data[1]; - cairo_dock_on_delete (pDock->pWidget, NULL, pDock); + Icon *pIcon = data[0]; + CairoContainer *pContainer = data[1]; + //cairo_dock_on_delete (pDock->pWidget, NULL, pDock); + if (pIcon == NULL) + { + if (CAIRO_DOCK_IS_DOCK (pContainer)) + pIcon = cairo_dock_get_dialogless_icon (); + else + pIcon = CAIRO_DESKLET (pContainer)->pIcon; + } + + int answer = cairo_dock_ask_question_and_wait (_("Quit Cairo-Dock ?"), pIcon, pContainer); + if (answer == GTK_RESPONSE_YES) + gtk_main_quit (); } @@ -311,7 +320,7 @@ gboolean config_ok; if (iLauncherType != CAIRO_DOCK_LAUNCHER_FOR_SEPARATOR) // inutile pour un separateur. - config_ok = cairo_dock_build_normal_gui (cNewDesktopFilePath, NULL, _("Fill this launcher"), CAIRO_DOCK_LAUNCHER_PANEL_WIDTH, CAIRO_DOCK_LAUNCHER_PANEL_HEIGHT, NULL, NULL, NULL); + config_ok = cairo_dock_build_normal_gui (cNewDesktopFilePath, NULL, _("Fill this launcher"), CAIRO_DOCK_LAUNCHER_PANEL_WIDTH, CAIRO_DOCK_LAUNCHER_PANEL_HEIGHT, NULL, NULL, NULL, NULL); //config_ok = cairo_dock_edit_conf_file (GTK_WINDOW (pDock->pWidget), cNewDesktopFilePath, _("Fill this launcher"), CAIRO_DOCK_LAUNCHER_PANEL_WIDTH, CAIRO_DOCK_LAUNCHER_PANEL_HEIGHT, 0, NULL, NULL, NULL, NULL, CAIRO_DOCK_GETTEXT_PACKAGE); else config_ok = TRUE; @@ -475,7 +484,7 @@ cairo_dock_update_launcher_desktop_file (cDesktopFilePath, CAIRO_DOCK_IS_SEPARATOR (icon) ? CAIRO_DOCK_LAUNCHER_FOR_SEPARATOR : (icon->pSubDock != NULL && icon->Xid == 0) ? CAIRO_DOCK_LAUNCHER_FOR_CONTAINER : CAIRO_DOCK_LAUNCHER_FROM_DESKTOP_FILE); - gboolean config_ok = cairo_dock_build_normal_gui (cDesktopFilePath, NULL, _("Modify this launcher"), CAIRO_DOCK_LAUNCHER_PANEL_WIDTH, CAIRO_DOCK_LAUNCHER_PANEL_HEIGHT, (CairoDockApplyConfigFunc)NULL, NULL, NULL); + gboolean config_ok = cairo_dock_build_normal_gui (cDesktopFilePath, NULL, _("Modify this launcher"), CAIRO_DOCK_LAUNCHER_PANEL_WIDTH, CAIRO_DOCK_LAUNCHER_PANEL_HEIGHT, (CairoDockApplyConfigFunc)NULL, NULL, NULL, NULL); g_free (cDesktopFilePath); if (config_ok) { @@ -527,7 +536,7 @@ pLabel = gtk_label_new (NULL); gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE); - g_string_printf (sInfo, "Size : %d bytes", iSize); + g_string_printf (sInfo, "Size : %lld bytes", iSize); if (iSize > 1024*1024) g_string_append_printf (sInfo, " (%.1f Mo)", 1. * iSize / 1024 / 1024); else if (iSize > 1024) @@ -663,7 +672,7 @@ g_free (cNewName); } - +/////////// LES OPERATIONS SUR LES APPLETS /////////////////////// static void _cairo_dock_initiate_config_module (GtkMenuItem *pMenuItem, gpointer *data) { @@ -723,6 +732,8 @@ cairo_dock_add_module_instance (icon->pModuleInstance->pModule); } +/////////// LES OPERATIONS SUR LES APPLIS /////////////////////// + static void _cairo_dock_close_appli (GtkMenuItem *pMenuItem, gpointer *data) { Icon *icon = data[0]; @@ -773,45 +784,62 @@ { Icon *icon = data[0]; CairoDock *pDock = data[1]; - g_return_if_fail (icon->Xid != 0); + g_return_if_fail (icon->Xid != 0 && icon->cClass != NULL); // on trouve le .desktop du programme. g_print ("%s (%s)\n", __func__, icon->cClass); gchar *cDesktopFilePath = g_strdup_printf ("/usr/share/applications/%s.desktop", icon->cClass); - - // on cree un nouveau lanceur a partir de la classe. - if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) + if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) // on n'a pas trouve la, on utilise locate. { g_free (cDesktopFilePath); cDesktopFilePath = g_strdup_printf ("/usr/share/applications/kde4/%s.desktop", icon->cClass); if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) { - // chercher un desktop qui contiennent StartupWMClass=class. + g_free (cDesktopFilePath); + cDesktopFilePath = NULL; + gchar *standard_output=NULL, *standard_error=NULL; + gint exit_status=0; + GError *erreur = NULL; + GString *sCommand = g_string_new (""); + gchar *cCommand = g_strdup_printf ("locate /%s.desktop --limit=1 -i", icon->cClass); + gboolean r = g_spawn_command_line_sync (cCommand, + &standard_output, + &standard_error, + &exit_status, + &erreur); + if (erreur != NULL) + { + cd_warning (erreur->message); + g_error_free (erreur); + } + if (standard_error != NULL && *standard_error != '\0') + { + cd_warning (standard_error); + } + if (standard_output != NULL && *standard_output != '\0') + { + if (standard_output[strlen (standard_output) - 1] == '\n') + standard_output[strlen (standard_output) - 1] = '\0'; + cDesktopFilePath = standard_output; + standard_output = NULL; + } + // else chercher un desktop qui contiennent StartupWMClass=class... + g_free (standard_output); + g_free (standard_error); } } + + // on cree un nouveau lanceur a partir de la classe. + if (cDesktopFilePath != NULL) { + g_print ("cDesktopFilePath : %s\n", cDesktopFilePath); cairo_dock_add_new_launcher_by_uri (cDesktopFilePath, g_pMainDock, CAIRO_DOCK_LAST_ORDER); } - g_free (cDesktopFilePath); -} - -static void _cairo_dock_close_class (GtkMenuItem *pMenuItem, gpointer *data) -{ - Icon *icon = data[0]; - CairoDock *pDock = data[1]; - if (icon->pSubDock != NULL) + else { - Icon *pIcon; - GList *ic; - for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) - { - pIcon = ic->data; - if (pIcon->Xid != 0) - { - cairo_dock_close_xwindow (pIcon->Xid); - } - } + cairo_dock_show_temporary_dialog_with_default_icon (_("Sorry, couldn't find the corresponding description file.\nConsider drag and dropping the launcher from the Applications Menu."), icon, CAIRO_CONTAINER (pDock), 8000); } + g_free (cDesktopFilePath); } static void _cairo_dock_maximize_appli (GtkMenuItem *pMenuItem, gpointer *data) @@ -881,6 +909,110 @@ } } +/////////// LES OPERATIONS SUR LES CLASSES /////////////////////// + +static void _cairo_dock_show_class (GtkMenuItem *pMenuItem, gpointer *data) +{ + Icon *icon = data[0]; + CairoDock *pDock = data[1]; + g_return_if_fail (icon->pSubDock != NULL); + + Icon *pIcon; + GList *ic; + for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) + { + pIcon = ic->data; + if (pIcon->Xid != 0) + { + cairo_dock_show_xwindow (pIcon->Xid); + } + } +} + +static void _cairo_dock_minimize_class (GtkMenuItem *pMenuItem, gpointer *data) +{ + Icon *icon = data[0]; + CairoDock *pDock = data[1]; + g_return_if_fail (icon->pSubDock != NULL); + + Icon *pIcon; + GList *ic; + for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) + { + pIcon = ic->data; + if (pIcon->Xid != 0) + { + cairo_dock_minimize_xwindow (pIcon->Xid); + } + } +} + +static void _cairo_dock_close_class (GtkMenuItem *pMenuItem, gpointer *data) +{ + Icon *icon = data[0]; + CairoDock *pDock = data[1]; + g_return_if_fail (icon->pSubDock != NULL); + + Icon *pIcon; + GList *ic; + for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) + { + pIcon = ic->data; + if (pIcon->Xid != 0) + { + cairo_dock_close_xwindow (pIcon->Xid); + } + } +} + +static void _cairo_dock_move_class_to_desktop (GtkMenuItem *pMenuItem, gpointer *user_data) +{ + gpointer *data = user_data[0]; + Icon *icon = data[0]; + CairoDock *pDock = data[1]; + g_return_if_fail (icon->pSubDock != NULL); + int iDesktopNumber = GPOINTER_TO_INT (user_data[1]); + int iViewPortNumberY = GPOINTER_TO_INT (user_data[2]); + int iViewPortNumberX = GPOINTER_TO_INT (user_data[3]); + cd_message ("%s (%d;%d;%d)", __func__, iDesktopNumber, iViewPortNumberX, iViewPortNumberY); + + Icon *pIcon; + GList *ic; + for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) + { + pIcon = ic->data; + if (pIcon->Xid != 0) + { + int iCurrentDesktopNumber = cairo_dock_get_window_desktop (pIcon->Xid); + int iCurrentViewPortX, iCurrentViewPortY; + cairo_dock_get_current_viewport (&iCurrentViewPortX, &iCurrentViewPortY); + cd_debug (" current_viewport : %d;%d", iCurrentViewPortX, iCurrentViewPortY); + + cairo_dock_move_xwindow_to_nth_desktop (pIcon->Xid, iDesktopNumber, iViewPortNumberX * g_iScreenWidth[CAIRO_DOCK_HORIZONTAL] - iCurrentViewPortX, iViewPortNumberY * g_iScreenHeight[CAIRO_DOCK_HORIZONTAL] - iCurrentViewPortY); + } + } +} + +static void _cairo_dock_move_class_to_current_desktop (GtkMenuItem *pMenuItem, gpointer *data) +{ + Icon *icon = data[0]; + CairoDock *pDock = data[1]; + g_return_if_fail (icon->pSubDock != NULL); + + int iCurrentDesktop = cairo_dock_get_current_desktop (); + Icon *pIcon; + GList *ic; + for (ic = icon->pSubDock->icons; ic != NULL; ic = ic->next) + { + pIcon = ic->data; + if (pIcon->Xid != 0) + { + cairo_dock_move_xwindow_to_nth_desktop (pIcon->Xid, iCurrentDesktop, 0, 0); // on ne veut pas decaler son viewport par rapport a nous. + } + } +} + +///////////////// LES OPERATIONS SUR LES DESKLETS ///////////////////// static void _cairo_dock_keep_below (GtkCheckMenuItem *pMenuItem, gpointer *data) { @@ -1033,7 +1165,7 @@ gchar *cTitle = g_strdup_printf (_("Set position for the dock '%s'"), cDockName); //gboolean config_ok = cairo_dock_edit_conf_file (GTK_WINDOW (pDock->pWidget), cConfFilePath, cTitle, CAIRO_DOCK_CONF_PANEL_WIDTH, CAIRO_DOCK_CONF_PANEL_HEIGHT, 0, NULL, NULL, NULL, NULL, CAIRO_DOCK_GETTEXT_PACKAGE); - gboolean config_ok = cairo_dock_build_normal_gui (cConfFilePath, NULL, cTitle, CAIRO_DOCK_CONF_PANEL_WIDTH, CAIRO_DOCK_CONF_PANEL_HEIGHT, NULL, NULL, NULL); + gboolean config_ok = cairo_dock_build_normal_gui (cConfFilePath, NULL, cTitle, CAIRO_DOCK_CONF_PANEL_WIDTH, CAIRO_DOCK_CONF_PANEL_HEIGHT, NULL, NULL, NULL, NULL); g_free (cTitle); if (config_ok) @@ -1170,6 +1302,52 @@ } +static void _add_desktops_entry (GtkWidget *pMenu, gboolean bAll, gpointer data) +{ + static gpointer *s_pDesktopData = NULL; + GtkWidget *pMenuItem, *image; + + if (g_iNbDesktops > 1 || g_iNbViewportX > 1 || g_iNbViewportY > 1) + { + int i, j, k, iDesktopCode; + const gchar *cLabel; + if (g_iNbDesktops > 1 && (g_iNbViewportX > 1 || g_iNbViewportY > 1)) + cLabel = bAll ? _("Move all to desktop %d - face %d") : _("Move to desktop %d - face %d"); + else if (g_iNbDesktops > 1) + cLabel = bAll ? _("Move all to desktop %d") : _("Move to desktop %d"); + else + cLabel = bAll ? _("Move all to face %d") : _("Moveto face %d"); + GString *sDesktop = g_string_new (""); + g_free (s_pDesktopData); + s_pDesktopData = g_new0 (gpointer, 4 * g_iNbDesktops * g_iNbViewportX * g_iNbViewportY); + gpointer *user_data; + + for (i = 0; i < g_iNbDesktops; i ++) // on range par bureau. + { + for (j = 0; j < g_iNbViewportY; j ++) // puis par rangee. + { + for (k = 0; k < g_iNbViewportX; k ++) + { + if (g_iNbDesktops > 1 && (g_iNbViewportX > 1 || g_iNbViewportY > 1)) + g_string_printf (sDesktop, cLabel, i+1, j*g_iNbViewportX+k+1); + else if (g_iNbDesktops > 1) + g_string_printf (sDesktop, cLabel, i+1); + else + g_string_printf (sDesktop, cLabel, j*g_iNbViewportX+k+1); + iDesktopCode = i * g_iNbViewportY * g_iNbViewportX + j * g_iNbViewportY + k; + user_data = &s_pDesktopData[4*iDesktopCode]; + user_data[0] = data; + user_data[1] = GINT_TO_POINTER (i); + user_data[2] = GINT_TO_POINTER (j); + user_data[3] = GINT_TO_POINTER (k); + + CAIRO_DOCK_ADD_IN_MENU_WITH_STOCK_AND_DATA (sDesktop->str, NULL, (bAll ? _cairo_dock_move_class_to_desktop : _cairo_dock_move_appli_to_desktop), pMenu, user_data); + } + } + } + g_string_free (sDesktop, TRUE); + } +} gboolean cairo_dock_notification_build_menu (gpointer *pUserData, Icon *icon, CairoContainer *pContainer, GtkWidget *menu) { static gpointer *data = NULL; @@ -1180,7 +1358,6 @@ data[1] = pContainer; data[2] = menu; GtkWidget *pMenuItem, *image; - static gpointer *pDesktopData = NULL; //\_________________________ Si pas d'icone dans un dock, on s'arrete la. if (! g_bLocked && CAIRO_DOCK_IS_DOCK (pContainer) && (icon == NULL || CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (icon))) @@ -1272,6 +1449,7 @@ } } } + if (CAIRO_DOCK_IS_APPLI (icon)) { pMenuItem = gtk_separator_menu_item_new (); @@ -1291,49 +1469,10 @@ gboolean bIsAbove=FALSE, bIsBelow=FALSE; cairo_dock_window_is_above_or_below (icon->Xid, &bIsAbove, &bIsBelow); _add_entry_in_menu (bIsAbove ? _("Don't keep above") : _("Keep above"), bIsAbove ? GTK_STOCK_GOTO_BOTTOM : GTK_STOCK_GOTO_TOP, _cairo_dock_change_window_above, pSubMenuOtherActions); - cd_debug ("g_iNbDesktops : %d ; g_iNbViewportX : %d ; g_iNbViewportY : %d", g_iNbDesktops, g_iNbViewportX, g_iNbViewportY); - if (g_iNbDesktops > 1 || g_iNbViewportX > 1 || g_iNbViewportY > 1) - { - int i, j, k, iDesktopCode; - const gchar *cLabel; - if (g_iNbDesktops > 1 && (g_iNbViewportX > 1 || g_iNbViewportY > 1)) - cLabel = _("Move to desktop %d - face %d"); - else if (g_iNbDesktops > 1) - cLabel = _("Move to desktop %d"); - else - cLabel = _("Move to face %d"); - GString *sDesktop = g_string_new (""); - g_free (pDesktopData); - pDesktopData = g_new0 (gpointer, 4 * g_iNbDesktops * g_iNbViewportX * g_iNbViewportY); - gpointer *user_data; - - for (i = 0; i < g_iNbDesktops; i ++) // on range par bureau. - { - for (j = 0; j < g_iNbViewportY; j ++) // puis par rangee. - { - for (k = 0; k < g_iNbViewportX; k ++) - { - if (g_iNbDesktops > 1 && (g_iNbViewportX > 1 || g_iNbViewportY > 1)) - g_string_printf (sDesktop, cLabel, i+1, j*g_iNbViewportX+k+1); - else if (g_iNbDesktops > 1) - g_string_printf (sDesktop, cLabel, i+1); - else - g_string_printf (sDesktop, cLabel, j*g_iNbViewportX+k+1); - iDesktopCode = i * g_iNbViewportY * g_iNbViewportX + j * g_iNbViewportY + k; - user_data = &pDesktopData[4*iDesktopCode]; - user_data[0] = data; - user_data[1] = GINT_TO_POINTER (i); - user_data[2] = GINT_TO_POINTER (j); - user_data[3] = GINT_TO_POINTER (k); - - CAIRO_DOCK_ADD_IN_MENU_WITH_STOCK_AND_DATA (sDesktop->str, NULL, _cairo_dock_move_appli_to_desktop, pSubMenuOtherActions, user_data); - } - } - } - g_string_free (sDesktop, TRUE); - - _add_entry_in_menu (_("Kill"), GTK_STOCK_CANCEL, _cairo_dock_kill_appli, pSubMenuOtherActions); - } + + _add_desktops_entry (pSubMenuOtherActions, FALSE, data); + + _add_entry_in_menu (_("Kill"), GTK_STOCK_CANCEL, _cairo_dock_kill_appli, pSubMenuOtherActions); //\_________________________ On rajoute les actions courantes sur les icones d'applis. if (icon->acDesktopFileName != NULL) // c'est un lanceur inhibiteur. @@ -1355,16 +1494,30 @@ _add_entry_in_menu (_("Close"), GTK_STOCK_CLOSE, _cairo_dock_close_appli, menu); } - else if (CAIRO_DOCK_IS_LAUNCHER (icon) && icon->pSubDock != NULL && icon->cClass != NULL) // inhibiteur avec sous-dock de classe. + else if (CAIRO_DOCK_IS_MULTI_APPLI (icon)) { pMenuItem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), pMenuItem); + //\_________________________ On rajoute les actions supplementaires sur toutes les icones du sous-dock. + pMenuItem = gtk_menu_item_new_with_label (_("Other actions")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), pMenuItem); + GtkWidget *pSubMenuOtherActions = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (pMenuItem), pSubMenuOtherActions); + + _add_entry_in_menu (_("Move all to this desktop"), GTK_STOCK_JUMP_TO, _cairo_dock_move_class_to_current_desktop, pSubMenuOtherActions); + + _add_desktops_entry (pSubMenuOtherActions, TRUE, data); + if (icon->acDesktopFileName != NULL) // c'est un lanceur inhibiteur. { _add_entry_in_menu (_("Launch new"), GTK_STOCK_ADD, _cairo_dock_launch_new, menu); } + _add_entry_in_menu (_("Show all"), GTK_STOCK_FIND, _cairo_dock_show_class, menu); + + _add_entry_in_menu (_("Minimize all"), GTK_STOCK_GO_DOWN, _cairo_dock_minimize_class, menu); + _add_entry_in_menu (_("Close all"), GTK_STOCK_CLOSE, _cairo_dock_close_class, menu); } @@ -1444,9 +1597,6 @@ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(pMenuItem), TRUE); g_signal_connect(G_OBJECT(pMenuItem), "toggled", G_CALLBACK(_cairo_dock_keep_below), data); - //pMenuItem = gtk_separator_menu_item_new (); - //gtk_menu_shell_append (GTK_MENU_SHELL (menu), pMenuItem); - pMenuItem = gtk_radio_menu_item_new_with_label(group, "Compiz Fusion Widget"); group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(pMenuItem)); gtk_menu_shell_append(GTK_MENU_SHELL(pSubMenuAccessibility), pMenuItem); diff -Nru cairo-dock-2.0.3/src/cairo-dock-menu.h cairo-dock-2.0.5/src/cairo-dock-menu.h --- cairo-dock-2.0.3/src/cairo-dock-menu.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-menu.h 2009-06-10 01:18:57.000000000 +0200 @@ -11,15 +11,22 @@ /** *Ajoute une entree avec une icone GTK a un menu deja existant. *@param cLabel nom de l'entree, tel qu'il apparaitra dans le menu. -*@param gtkStock nom d'une icone de GTK. +*@param gtkStock nom d'une icone de GTK ou chemin complet d'une image quelconque. *@param pFunction fonction appelee lors de la selection de cette entree. *@param pMenu GtkWidget du menu auquel on rajoutera l'entree. *@param pData donnees passees en parametre de la fonction (doit contenir myApplet). */ #define CAIRO_DOCK_ADD_IN_MENU_WITH_STOCK_AND_DATA(cLabel, gtkStock, pFunction, pMenu, pData) do { \ pMenuItem = gtk_image_menu_item_new_with_label (cLabel); \ - image = gtk_image_new_from_stock (gtkStock, GTK_ICON_SIZE_MENU); \ - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image); \ + if (gtkStock) {\ + gchar *_cImage = gtkStock;\ + if (*_cImage == '/') {\ + GdkPixbuf *_pixbuf = gdk_pixbuf_new_from_file_at_size (_cImage, 24, 24, NULL);\ + image = gtk_image_new_from_pixbuf (_pixbuf);\ + g_object_unref (_pixbuf); }\ + else {\ + image = gtk_image_new_from_stock (_cImage, GTK_ICON_SIZE_MENU); }\ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image); }\ gtk_menu_shell_append (GTK_MENU_SHELL (pMenu), pMenuItem); \ g_signal_connect (G_OBJECT (pMenuItem), "activate", G_CALLBACK(pFunction), pData); } while (0) diff -Nru cairo-dock-2.0.3/src/cairo-dock-modules.c cairo-dock-2.0.5/src/cairo-dock-modules.c --- cairo-dock-2.0.3/src/cairo-dock-modules.c 2009-05-22 01:29:23.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-modules.c 2009-06-10 01:33:05.000000000 +0200 @@ -41,6 +41,7 @@ #include "cairo-dock-internal-icons.h" #include "cairo-dock-dialogs.h" #include "cairo-dock-file-manager.h" +#include "cairo-dock-container.h" #include "cairo-dock-modules.h" #define CAIRO_DOCK_MODULE_PANEL_WIDTH 700 @@ -247,7 +248,7 @@ if (pVisitCard->cModuleName == NULL) pVisitCard->cModuleName = cairo_dock_extract_default_module_name_from_path (pCairoDockModule->cSoFilePath); - if (pCairoDockModule->pInterface->initModule == NULL || pCairoDockModule->pInterface->stopModule == NULL || pCairoDockModule->pVisitCard->cInternalModule != NULL) // c'est un module qui ne peut etre activer et/ou desactiver; on l'activera donc automatiquement. + if (cairo_dock_module_is_auto_loaded (pCairoDockModule)) // c'est un module qui soit ne peut etre activer et/ou desactiver, soit s'est lie a un module interne; on l'activera donc automatiquement. { s_AutoLoadedModules = g_list_prepend (s_AutoLoadedModules, pCairoDockModule); } @@ -341,23 +342,16 @@ if (cActiveModuleList == NULL) return ; + //\_______________ On active les modules auto-charges en premier. GError *erreur = NULL; gchar *cModuleName; CairoDockModule *pModule; - int i = 0; - while (cActiveModuleList[i] != NULL) + GList *m; + for (m = s_AutoLoadedModules; m != NULL; m = m->next) { - cModuleName = cActiveModuleList[i]; - pModule = g_hash_table_lookup (s_hModuleTable, cModuleName); - if (pModule == NULL) - { - cd_warning ("No such module (%s)", cModuleName); - i ++; - continue ; - } - + pModule = m->data; pModule->fLastLoadingTime = fTime; - if (pModule->pInstancesList == NULL) + if (pModule->pInstancesList == NULL) // on ne les active qu'une seule fois. Si lors d'un changement de theme on re-active les modules, ceux-la resteront inchanges. { cairo_dock_activate_module (pModule, &erreur); if (erreur != NULL) @@ -367,16 +361,21 @@ erreur = NULL; } } - else - { - cairo_dock_reload_module (pModule, FALSE); - } - i ++; } - GList *m; - for (m = s_AutoLoadedModules; m != NULL; m = m->next) + + //\_______________ On active tous les autres. + int i = 0; + while (cActiveModuleList[i] != NULL) { - pModule = m->data; + cModuleName = cActiveModuleList[i]; + pModule = g_hash_table_lookup (s_hModuleTable, cModuleName); + if (pModule == NULL) + { + cd_warning ("No such module (%s)", cModuleName); + i ++; + continue ; + } + pModule->fLastLoadingTime = fTime; if (pModule->pInstancesList == NULL) { @@ -392,6 +391,7 @@ { cairo_dock_reload_module (pModule, FALSE); } + i ++; } } @@ -983,7 +983,7 @@ GList *pModuleList = g_hash_table_get_values (s_hModuleTable); pModuleList = g_list_sort (pModuleList, (GCompareFunc) _sort_module_by_alphabetical_order); - CairoDockModule *pModule = g_list_find_custom (pModuleList, user_data, pCallback); + CairoDockModule *pModule = (CairoDockModule *)g_list_find_custom (pModuleList, user_data, pCallback); g_list_free (pModuleList); return pModule; @@ -993,7 +993,7 @@ static void _cairo_dock_write_one_module_name (gchar *cModuleName, CairoDockModule *pModule, GString *pString) { - if (pModule->pInstancesList != NULL) + if (pModule->pInstancesList != NULL && ! cairo_dock_module_is_auto_loaded (pModule)) { g_string_append_printf (pString, "%s;", cModuleName); } @@ -1149,7 +1149,7 @@ pInstance->pDrawContext = cairo_create (pIcon->pIconBuffer); if (cairo_status (pInstance->pDrawContext) != CAIRO_STATUS_SUCCESS) { - cd_warning ("couldn't initialize drawing context, applet won't be able to draw its stuff !"); + cd_warning ("couldn't initialize drawing context, applet won't be able to draw itself !"); bCanInit = FALSE; } } diff -Nru cairo-dock-2.0.3/src/cairo-dock-modules.h cairo-dock-2.0.5/src/cairo-dock-modules.h --- cairo-dock-2.0.3/src/cairo-dock-modules.h 2009-05-20 20:35:57.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-modules.h 2009-06-10 01:19:04.000000000 +0200 @@ -110,6 +110,7 @@ void cairo_dock_attach_to_another_module (CairoDockVisitCard *pVisitCard, const gchar *cOtherModuleName); +#define cairo_dock_module_is_auto_loaded(pModule) (pModule->pInterface->initModule == NULL || pModule->pInterface->stopModule == NULL || pModule->pVisitCard->cInternalModule != NULL) G_END_DECLS #endif diff -Nru cairo-dock-2.0.3/src/cairo-dock-struct.h cairo-dock-2.0.5/src/cairo-dock-struct.h --- cairo-dock-2.0.3/src/cairo-dock-struct.h 2009-05-20 21:51:10.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-struct.h 2009-06-10 01:19:01.000000000 +0200 @@ -77,51 +77,6 @@ #define CAIRO_DOCK_NB_DATA_SLOT 12 -struct _CairoContainer { - /// type de container. - CairoDockTypeContainer iType; - /// La fenetre du widget. - GtkWidget *pWidget; - /// Taille de la fenetre. - gint iWidth, iHeight; - /// Position de la fenetre. - gint iWindowPositionX, iWindowPositionY; - /// Vrai ssi le pointeur est dans le container (widgets fils inclus). - gboolean bInside; - /// TRUE ssi le container est horizontal. - CairoDockTypeHorizontality bIsHorizontal; - /// TRUE ssi le container est oriente vers le haut. - gboolean bDirectionUp; -#ifdef HAVE_GLITZ - glitz_drawable_format_t *pDrawFormat; - glitz_drawable_t* pGlitzDrawable; - glitz_format_t* pGlitzFormat; -#else - gpointer padding[3]; -#endif - /// Donnees exterieures. - gpointer pDataSlot[CAIRO_DOCK_NB_DATA_SLOT]; - /// pour l'animation du container. - gint iSidGLAnimation; - /// intervalle de temps entre 2 etapes de l'animation. - gint iAnimationDeltaT; - /// derniere position en X du curseur dans le referentiel du container. - gint iMouseX; - /// derniere position en Y du curseur dans le referentiel du container. - gint iMouseY; - /// zoom applique aux icones du container. - gdouble fRatio; - /// TRUE ssi le container est reflechissant. - gboolean bUseReflect; - /// contexte OpenGL associe a la fenetre. - GLXContext glContext; - /// TRUE <=> une animation lente est en cours. - gboolean bKeepSlowAnimation; -}; - -#define CAIRO_CONTAINER(p) ((CairoContainer *) (p)) - - typedef void (*CairoDockCalculateMaxDockSizeFunc) (CairoDock *pDock); typedef Icon * (*CairoDockCalculateIconsFunc) (CairoDock *pDock); typedef void (*CairoDockRenderFunc) (cairo_t *pCairoContext, CairoDock *pDock); @@ -435,8 +390,8 @@ typedef enum { CAIRO_DESKLET_NORMAL = 0, - CAIRO_DESKLET_KEEP_BELOW, CAIRO_DESKLET_KEEP_ABOVE, + CAIRO_DESKLET_KEEP_BELOW, CAIRO_DESKLET_ON_WIDGET_LAYER, CAIRO_DESKLET_RESERVE_SPACE } CairoDeskletAccessibility; @@ -816,17 +771,6 @@ typedef void (* CairoDockConfigFunc) (gchar *cConfFile, gpointer data); -struct _CairoDockClassAppli { - /// TRUE ssi l'appli doit utiliser l'icone fournie par X au lieu de celle du theme. - gboolean bUseXIcon; - /// TRUE ssi l'appli ne se groupe pas par classe. - gboolean bExpand; - /// Liste des inhibiteurs de la classe. - GList *pIconsOfClass; - /// Liste des icones d'appli de cette classe. - GList *pAppliOfClass; -}; - struct _CairoDockLabelDescription { /// Taille de la police (et hauteur du texte en pixels). gint iSize; diff -Nru cairo-dock-2.0.3/src/cairo-dock-surface-factory.c cairo-dock-2.0.5/src/cairo-dock-surface-factory.c --- cairo-dock-2.0.3/src/cairo-dock-surface-factory.c 2009-05-23 01:45:47.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-surface-factory.c 2009-06-10 01:19:02.000000000 +0200 @@ -203,26 +203,33 @@ switch (iOrientation) { case CAIRO_DOCK_ORIENTATION_HFLIP : + g_print ("orientation : HFLIP\n"); cairo_scale (pCairoContext, -1., 1.); break ; case CAIRO_DOCK_ORIENTATION_ROT_180 : + g_print ("orientation : ROT_180\n"); cairo_rotate (pCairoContext, G_PI); break ; case CAIRO_DOCK_ORIENTATION_VFLIP : + g_print ("orientation : VFLIP\n"); cairo_scale (pCairoContext, 1., -1.); break ; case CAIRO_DOCK_ORIENTATION_ROT_90_HFLIP : + g_print ("orientation : ROT_90_HFLIP\n"); cairo_scale (pCairoContext, -1., 1.); cairo_rotate (pCairoContext, - G_PI/2); break ; case CAIRO_DOCK_ORIENTATION_ROT_90 : + g_print ("orientation : ROT_90\n"); cairo_rotate (pCairoContext, - G_PI/2); break ; case CAIRO_DOCK_ORIENTATION_ROT_90_VFLIP : + g_print ("orientation : ROT_90_VFLIP\n"); cairo_scale (pCairoContext, 1., -1.); cairo_rotate (pCairoContext, - G_PI/2); break ; case CAIRO_DOCK_ORIENTATION_ROT_270 : + g_print ("orientation : ROT_270\n"); cairo_rotate (pCairoContext, G_PI/2); break ; default : @@ -725,7 +732,7 @@ int i; for (i = 0; i < 4; i++) { - cairo_move_to (pCairoContext, i&2-1, 2*(i&1)-1); + cairo_move_to (pCairoContext, i&2, 2*(i&1)); pango_cairo_show_layout (pCairoContext, pLayout); } cairo_pop_group_to_source (pCairoContext); @@ -741,13 +748,13 @@ /// faut-il vraiment ajouter les ink dans le pattern ??? if (pLabelDescription->bVerticalPattern) pGradationPattern = cairo_pattern_create_linear (0., - ink.y + 0 + 0*iOutlineMargin/2, // meme remarque pour le +1. + ink.y + 1 + 0 + 0*iOutlineMargin/2, // meme remarque pour le +1. 0., - ink.y + 0 + 0*iOutlineMargin/2 + ink.height); + ink.y + 1 + 0 + 0*iOutlineMargin/2 + ink.height); else - pGradationPattern = cairo_pattern_create_linear (ink.x + 0*iOutlineMargin/2, + pGradationPattern = cairo_pattern_create_linear (ink.x + 0*iOutlineMargin/2 + 1, 0., - ink.x + 0*iOutlineMargin/2 + ink.width, + ink.x + 1 + 0*iOutlineMargin/2 + ink.width, 0.); g_return_val_if_fail (cairo_pattern_status (pGradationPattern) == CAIRO_STATUS_SUCCESS, NULL); cairo_pattern_set_extend (pGradationPattern, CAIRO_EXTEND_NONE); @@ -770,6 +777,7 @@ cairo_move_to (pCairoContext, 0, 0); if (fZoomX != 1) cairo_scale (pCairoContext, fZoomX, 1.); + cairo_move_to (pCairoContext, 1,1); pango_cairo_show_layout (pCairoContext, pLayout); cairo_pattern_destroy (pGradationPattern); diff -Nru cairo-dock-2.0.3/src/cairo-dock-themes-manager.c cairo-dock-2.0.5/src/cairo-dock-themes-manager.c --- cairo-dock-2.0.3/src/cairo-dock-themes-manager.c 2009-05-20 22:21:37.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-themes-manager.c 2009-06-10 02:25:32.000000000 +0200 @@ -10,6 +10,7 @@ #include #define __USE_XOPEN_EXTENDED #include +#include #include #include @@ -48,6 +49,8 @@ extern int g_iWmHint; extern gboolean g_bForceOpenGL; +static GtkWidget *s_pThemeManager = NULL; + void cairo_dock_free_theme (CairoDockTheme *pTheme) { if (pTheme == NULL) @@ -139,6 +142,7 @@ gchar *cairo_dock_download_file (const gchar *cServerAdress, const gchar *cDistantFilePath, const gchar *cDistantFileName, gint iShowActivity, const gchar *cExtractTo, GError **erreur) { + cairo_dock_set_status_message_printf (s_pThemeManager, _("Downloading file %s ..."), cDistantFileName); gchar *cTmpFilePath = g_strdup ("/tmp/cairo-dock-net-file.XXXXXX"); int fds = mkstemp (cTmpFilePath); if (fds == -1) @@ -159,8 +163,8 @@ } gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "xterm -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : "")); g_print ("%s\n", cCommand); + int r = system (cCommand); - close(fds); if (r != 0) { g_set_error (erreur, 1, 1, "an error occured while executing '%s'", cCommand); @@ -168,6 +172,27 @@ g_free (cTmpFilePath); cTmpFilePath = NULL; } + + gboolean bOk = (cTmpFilePath != NULL); + if (cTmpFilePath != NULL) + { + struct stat buf; + stat (cTmpFilePath, &buf); + bOk = (buf.st_size > 0); + } + if (! bOk) + { + g_set_error (erreur, 1, 1, "couldn't get distant file %s", cDistantFileName); + cairo_dock_set_status_message_printf (s_pThemeManager, _("couldn't get distant file %s"), cDistantFileName); + g_remove (cTmpFilePath); + g_free (cTmpFilePath); + cTmpFilePath = NULL; + } + else + { + cairo_dock_set_status_message (s_pThemeManager, ""); + } + close(fds); g_free (cCommand); if (cTmpFilePath != NULL && cExtractTo != NULL) @@ -226,7 +251,7 @@ cd_message ("listing net themes on %s/%s ...", cServerAdress, cDirectory); GError *tmp_erreur = NULL; - gchar *cContent = cairo_dock_get_distant_file_content (cServerAdress, cDirectory, cListFileName, 1, &tmp_erreur); + gchar *cContent = cairo_dock_get_distant_file_content (cServerAdress, cDirectory, cListFileName, 0, &tmp_erreur); if (tmp_erreur != NULL) { cd_warning ("couldn't retrieve themes on %s (check that your connection is alive, or retry later)", cServerAdress); @@ -383,18 +408,22 @@ -static void on_theme_destroy (gpointer *user_data) +static void on_theme_destroy (gchar *cInitConfFile) { g_print ("%s ()\n", __func__); - g_remove (user_data[0]); - g_free (user_data[0]); - cairo_dock_dialog_unreference (user_data[2]); - g_free (user_data); + g_remove (cInitConfFile); + g_free (cInitConfFile); + s_pThemeManager = NULL; +} + +static gboolean _find_module_from_user_data_dir (gchar *cModuleName, CairoDockModule *pModule, const gchar *cUserDataDirName) +{ + if (pModule->pVisitCard->cUserDataDir && strcmp (cUserDataDirName, pModule->pVisitCard->cUserDataDir) == 0) + return TRUE; + return FALSE; } -static gboolean on_theme_apply (gpointer *user_data) +static gboolean on_theme_apply (gchar *cInitConfFile) { - gchar *cInitConfFile = user_data[0]; - GtkWidget *pWidget = user_data[2]; g_print ("%s (%s)\n", __func__, cInitConfFile); GError *erreur = NULL; int r; // resultat de system(). @@ -652,7 +681,7 @@ } g_free (cUserThemesDir); - g_return_val_if_fail (cNewThemePath != NULL, TRUE); + g_return_val_if_fail (cNewThemePath != NULL && g_file_test (cNewThemePath, G_FILE_TEST_EXISTS), TRUE); g_print ("cNewThemePath : %s\n", cNewThemePath); //\___________________ On charge les parametres de comportement. @@ -737,36 +766,51 @@ } else { - g_string_printf (sCommand, "find '%s' -mindepth 1 ! -name '*.conf' ! -path '%s/%s*' ! -type d -exec cp -p {} '%s' \\;", cNewThemePath, cNewThemePath, CAIRO_DOCK_LAUNCHERS_DIR, g_cCurrentThemePath); // copie tous les fichiers du nouveau theme sauf les lanceurs/icones et les .conf du dock et des plug-ins. + g_string_printf (sCommand, "find '%s' -mindepth 1 ! -name '*.conf' ! -path '%s/%s*' ! -type d -exec cp -p {} '%s' \\;", cNewThemePath, cNewThemePath, CAIRO_DOCK_LAUNCHERS_DIR, g_cCurrentThemePath); // copie tous les fichiers du nouveau theme sauf les lanceurs et les .conf du dock et des plug-ins. cd_message (sCommand->str); r = system (sCommand->str); gchar *cNewPlugInsDir = g_strdup_printf ("%s/%s", cNewThemePath, "plug-ins"); GDir *dir = g_dir_open (cNewPlugInsDir, 0, NULL); // NULL si ce theme n'a pas de repertoire 'plug-ins'. - const gchar* cModuleName; - gchar *cConfFilePath, *cNewConfFilePath, *cUserDataDirPath; + const gchar* cModuleDirName; + gchar *cConfFilePath, *cNewConfFilePath, *cUserDataDirPath, *cConfFileName; do { - cModuleName = g_dir_read_name (dir); - if (cModuleName == NULL) + cModuleDirName = g_dir_read_name (dir); + if (cModuleDirName == NULL) break ; - CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName); + /*CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName); if (pModule == NULL || pModule->pVisitCard == NULL) - continue; + continue;*/ - cd_debug (" installing %s's config\n", cModuleName); - cUserDataDirPath = g_strdup_printf ("%s/plug-ins/%s", g_cCurrentThemePath, pModule->pVisitCard->cUserDataDir); + cd_debug (" installing %s's config\n", cModuleDirName); + cUserDataDirPath = g_strdup_printf ("%s/plug-ins/%s", g_cCurrentThemePath, cModuleDirName); if (! g_file_test (cUserDataDirPath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { cd_debug (" directory %s doesn't exist, it will be created.", cUserDataDirPath); - gchar *command = g_strdup_printf ("mkdir -p %s", cUserDataDirPath); + gchar *command = g_strdup_printf ("mkdir -p '%s'", cUserDataDirPath); r = system (command); g_free (command); } - cConfFilePath = g_strdup_printf ("%s/%s", cUserDataDirPath, pModule->pVisitCard->cConfFileName); - cNewConfFilePath = g_strdup_printf ("%s/%s/%s", cNewPlugInsDir, pModule->pVisitCard->cUserDataDir, pModule->pVisitCard->cConfFileName); + + cConfFileName = g_strdup_printf ("%s.conf", cModuleDirName); + cNewConfFilePath = g_strdup_printf ("%s/%s/%s", cNewPlugInsDir, cModuleDirName, cConfFileName); + if (! g_file_test (cNewConfFilePath, G_FILE_TEST_EXISTS)) + { + g_free (cConfFileName); + g_free (cNewConfFilePath); + CairoDockModule *pModule = cairo_dock_foreach_module ((GHRFunc) _find_module_from_user_data_dir, cModuleDirName); + if (pModule == NULL) // du coup, dans ce cas-la, on ne charge pas des plug-ins non utilises par l'utilisateur. + { + cd_warning ("couldn't find the module owning '%s', this file will be ignored."); + continue; + } + cConfFileName = g_strdup (pModule->pVisitCard->cConfFileName); + cNewConfFilePath = g_strdup_printf ("%s/%s/%s", cNewPlugInsDir, cModuleDirName, cConfFileName); + } + cConfFilePath = g_strdup_printf ("%s/%s", cUserDataDirPath, cConfFileName); if (! g_file_test (cConfFilePath, G_FILE_TEST_EXISTS)) { @@ -782,6 +826,7 @@ g_free (cNewConfFilePath); g_free (cConfFilePath); g_free (cUserDataDirPath); + g_free (cConfFileName); } while (1); g_dir_close (dir); @@ -798,39 +843,27 @@ return TRUE; } -gboolean cairo_dock_manage_themes (GtkWidget *pWidget, CairoDockStartMode iMode) +void cairo_dock_manage_themes (void) { + if (s_pThemeManager != NULL) + { + gtk_window_present (GTK_WINDOW (s_pThemeManager)); + return ; + } + gchar *cInitConfFile = cairo_dock_build_temporary_themes_conf_file (); // sera supprime a la destruction de la fenetre. //\___________________ On laisse l'utilisateur l'editer. gchar *cPresentedGroup = (cairo_dock_theme_need_save () ? "Save" : NULL); - const gchar *cTitle = (iMode == CAIRO_DOCK_START_SAFE ? _("< Safe Mode >") : _("Manage Themes")); + const gchar *cTitle = _("Manage Themes"); - CairoDialog *pDialog = NULL; - if (iMode == CAIRO_DOCK_START_SAFE) - { - pDialog = cairo_dock_show_general_message (_("You are running Cairo-Dock in safe mode.\nWhy ? Probably because a plug-in has messed into your dock,\n or maybe your theme has got corrupted.\nSo, no plug-in will be available, and you can now save your current theme if you want\n before you start using the dock.\nTry with your current theme, if it works, it means a plug-in is wrong.\nOtherwise, try with another theme.\nSave a config that is working, and restart the dock in normal mode.\nThen, activate plug-ins one by one to guess which one is wrong."), 0.); - g_print ("safe mode ...\n"); - while (gtk_events_pending ()) - gtk_main_iteration (); - } - - gpointer *data = g_new0 (gpointer, 3); - data[0] = cInitConfFile; - data[1] = NULL; - data[2] = pDialog; - if (iMode == CAIRO_DOCK_START_NOMINAL) - { - gboolean bChoiceOK = cairo_dock_build_normal_gui (cInitConfFile, NULL, cTitle, CAIRO_DOCK_THEME_PANEL_WIDTH, CAIRO_DOCK_THEME_PANEL_HEIGHT, (CairoDockApplyConfigFunc) on_theme_apply, data, (GFreeFunc) on_theme_destroy); - } - else // maintenance ou sans echec. - { - gboolean bChoiceOK = cairo_dock_build_normal_gui (cInitConfFile, NULL, cTitle, CAIRO_DOCK_THEME_PANEL_WIDTH, CAIRO_DOCK_THEME_PANEL_HEIGHT, NULL, NULL, NULL); // bloquant. - on_theme_apply (data); - on_theme_destroy (data); - } - - return FALSE; + cairo_dock_build_normal_gui (cInitConfFile, + NULL, cTitle, + CAIRO_DOCK_THEME_PANEL_WIDTH, CAIRO_DOCK_THEME_PANEL_HEIGHT, + (CairoDockApplyConfigFunc) on_theme_apply, + cInitConfFile, + (GFreeFunc) on_theme_destroy, + &s_pThemeManager); } gchar *cairo_dock_get_theme_path (const gchar *cThemeName, const gchar *cShareThemesDir, const gchar *cUserThemesDir, const gchar *cDistantThemesDir) @@ -861,11 +894,12 @@ { gchar *cDistantFileName = g_strdup_printf ("%s/%s.tar.gz", cThemeName, cThemeName); GError *erreur = NULL; - cThemePath = cairo_dock_download_file (g_cThemeServerAdress != NULL ? g_cThemeServerAdress : CAIRO_DOCK_THEME_SERVER, cDistantThemesDir, cDistantFileName, 2, cUserThemesDir, &erreur); + cThemePath = cairo_dock_download_file (g_cThemeServerAdress != NULL ? g_cThemeServerAdress : CAIRO_DOCK_THEME_SERVER, cDistantThemesDir, cDistantFileName, 0, cUserThemesDir, &erreur); g_free (cDistantFileName); if (erreur != NULL) { cd_warning ("couldn't retrieve distant theme %s : %s" , cThemeName, erreur->message); + cairo_dock_set_status_message_printf (s_pThemeManager, _("couldn't retrieve distant theme %s"), cThemeName); // le message sera repris par une bulle de dialogue, mais on le met la aussi quand meme. g_error_free (erreur); } } diff -Nru cairo-dock-2.0.3/src/cairo-dock-themes-manager.h cairo-dock-2.0.5/src/cairo-dock-themes-manager.h --- cairo-dock-2.0.3/src/cairo-dock-themes-manager.h 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-themes-manager.h 2009-06-10 01:19:01.000000000 +0200 @@ -79,8 +79,9 @@ void cairo_dock_mark_theme_as_modified (gboolean bModified); gboolean cairo_dock_theme_need_save (void); - -gboolean cairo_dock_manage_themes (GtkWidget *pWidget, CairoDockStartMode iMode); +/** Build and show the Theme Manager window. + * */ +void cairo_dock_manage_themes (void); /** Look for a theme with a given name into differente sources. It is faster than getting the list of themes and looking for the given one. *@param cThemeName name of the theme. diff -Nru cairo-dock-2.0.3/src/cairo-dock-X-utilities.c cairo-dock-2.0.5/src/cairo-dock-X-utilities.c --- cairo-dock-2.0.3/src/cairo-dock-X-utilities.c 2009-05-20 20:29:30.000000000 +0200 +++ cairo-dock-2.0.5/src/cairo-dock-X-utilities.c 2009-06-10 01:18:57.000000000 +0200 @@ -46,6 +46,7 @@ static Atom s_aNetWmWindowTypeNormal; static Atom s_aNetWmWindowTypeUtility; static Atom s_aNetWmWindowTypeDock; +static Atom s_aNetWmIconGeometry; static Atom s_aNetCurrentDesktop; static Atom s_aNetDesktopViewport; static Atom s_aNetDesktopGeometry; @@ -70,6 +71,7 @@ s_aNetWmWindowTypeNormal = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_NORMAL", False); s_aNetWmWindowTypeUtility = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_UTILITY", False); s_aNetWmWindowTypeDock = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_DOCK", False); + s_aNetWmIconGeometry = XInternAtom (s_XDisplay, "_NET_WM_ICON_GEOMETRY", False); s_aNetCurrentDesktop = XInternAtom (s_XDisplay, "_NET_CURRENT_DESKTOP", False); s_aNetDesktopViewport = XInternAtom (s_XDisplay, "_NET_DESKTOP_VIEWPORT", False); s_aNetDesktopGeometry = XInternAtom (s_XDisplay, "_NET_DESKTOP_GEOMETRY", False); @@ -225,7 +227,7 @@ } -static inline _cairo_dock_window_has_type (int Xid, Atom iType) +static inline gboolean _cairo_dock_window_has_type (int Xid, Atom iType) { g_return_val_if_fail (Xid > 0, FALSE); @@ -261,12 +263,17 @@ g_return_if_fail (Xid > 0); gulong iIconGeometry[4] = {iX, iY, iWidth, iHeight}; - - XChangeProperty (s_XDisplay, - Xid, - XInternAtom (s_XDisplay, "_NET_WM_ICON_GEOMETRY", False), - XA_CARDINAL, 32, PropModeReplace, - (guchar *) iIconGeometry, 4); + + if (iWidth == 0 || iHeight == 0) + XDeleteProperty (s_XDisplay, + Xid, + s_aNetWmIconGeometry); + else + XChangeProperty (s_XDisplay, + Xid, + s_aNetWmIconGeometry, + XA_CARDINAL, 32, PropModeReplace, + (guchar *) iIconGeometry, 4); } gboolean cairo_dock_update_screen_geometry (void) diff -Nru cairo-dock-2.0.3/src/Makefile.am cairo-dock-2.0.5/src/Makefile.am --- cairo-dock-2.0.3/src/Makefile.am 2009-04-30 01:53:30.000000000 +0200 +++ cairo-dock-2.0.5/src/Makefile.am 2009-06-07 01:03:43.000000000 +0200 @@ -34,6 +34,7 @@ -DCAIRO_DOCK_THEME_CONF_FILE=\""themes.conf"\"\ -DCAIRO_DOCK_MAIN_DOCK_CONF_FILE=\""main-dock.conf"\"\ -DCAIRO_DOCK_DEFAULT_ICON_NAME=\""default-icon.svg"\"\ + -DCAIRO_DOCK_DEFAULT_APPLI_ICON_NAME=\""default-icon-appli.svg"\"\ -DCAIRO_DOCK_DEFAULT_INDICATOR_NAME=\""default-indicator.png"\"\ -DCAIRO_DOCK_DEFAULT_CLASS_INDICATOR_NAME=\""default-class-indicator.svg"\"\ -DCAIRO_DOCK_VERSION=\""$(VERSION)"\"\ @@ -124,6 +125,8 @@ cairo-dock-X-utilities.h\ cairo-dock-gauge.c\ cairo-dock-gauge.h\ + cairo-dock-gauge2.c\ + cairo-dock-gauge2.h\ cairo-dock-dock-manager.c\ cairo-dock-dock-manager.h\ cairo-dock-class-manager.c\ @@ -222,6 +225,7 @@ cairo-dock-log.h\ cairo-dock-X-utilities.h\ cairo-dock-gauge.h\ + cairo-dock-gauge2.h\ cairo-dock-dock-manager.h\ cairo-dock-class-manager.h\ cairo-dock-emblem.h\ diff -Nru cairo-dock-2.0.3/src/Makefile.in cairo-dock-2.0.5/src/Makefile.in --- cairo-dock-2.0.3/src/Makefile.in 2009-05-23 02:55:14.000000000 +0200 +++ cairo-dock-2.0.5/src/Makefile.in 2009-06-10 02:32:02.000000000 +0200 @@ -82,6 +82,7 @@ cairo_dock-cairo-dock-log.$(OBJEXT) \ cairo_dock-cairo-dock-X-utilities.$(OBJEXT) \ cairo_dock-cairo-dock-gauge.$(OBJEXT) \ + cairo_dock-cairo-dock-gauge2.$(OBJEXT) \ cairo_dock-cairo-dock-dock-manager.$(OBJEXT) \ cairo_dock-cairo-dock-class-manager.$(OBJEXT) \ cairo_dock-cairo-dock-emblem.$(OBJEXT) \ @@ -311,6 +312,7 @@ -DCAIRO_DOCK_THEME_CONF_FILE=\""themes.conf"\"\ -DCAIRO_DOCK_MAIN_DOCK_CONF_FILE=\""main-dock.conf"\"\ -DCAIRO_DOCK_DEFAULT_ICON_NAME=\""default-icon.svg"\"\ + -DCAIRO_DOCK_DEFAULT_APPLI_ICON_NAME=\""default-icon-appli.svg"\"\ -DCAIRO_DOCK_DEFAULT_INDICATOR_NAME=\""default-indicator.png"\"\ -DCAIRO_DOCK_DEFAULT_CLASS_INDICATOR_NAME=\""default-class-indicator.svg"\"\ -DCAIRO_DOCK_VERSION=\""$(VERSION)"\"\ @@ -401,6 +403,8 @@ cairo-dock-X-utilities.h\ cairo-dock-gauge.c\ cairo-dock-gauge.h\ + cairo-dock-gauge2.c\ + cairo-dock-gauge2.h\ cairo-dock-dock-manager.c\ cairo-dock-dock-manager.h\ cairo-dock-class-manager.c\ @@ -498,6 +502,7 @@ cairo-dock-log.h\ cairo-dock-X-utilities.h\ cairo-dock-gauge.h\ + cairo-dock-gauge2.h\ cairo-dock-dock-manager.h\ cairo-dock-class-manager.h\ cairo-dock-emblem.h\ @@ -624,6 +629,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-file-manager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-flying-container.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-gauge.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-gauge2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-graph.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-gui-callbacks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cairo_dock-cairo-dock-gui-factory.Po@am__quote@ @@ -1127,6 +1133,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -c -o cairo_dock-cairo-dock-gauge.obj `if test -f 'cairo-dock-gauge.c'; then $(CYGPATH_W) 'cairo-dock-gauge.c'; else $(CYGPATH_W) '$(srcdir)/cairo-dock-gauge.c'; fi` +cairo_dock-cairo-dock-gauge2.o: cairo-dock-gauge2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -MT cairo_dock-cairo-dock-gauge2.o -MD -MP -MF $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Tpo -c -o cairo_dock-cairo-dock-gauge2.o `test -f 'cairo-dock-gauge2.c' || echo '$(srcdir)/'`cairo-dock-gauge2.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Tpo $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cairo-dock-gauge2.c' object='cairo_dock-cairo-dock-gauge2.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -c -o cairo_dock-cairo-dock-gauge2.o `test -f 'cairo-dock-gauge2.c' || echo '$(srcdir)/'`cairo-dock-gauge2.c + +cairo_dock-cairo-dock-gauge2.obj: cairo-dock-gauge2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -MT cairo_dock-cairo-dock-gauge2.obj -MD -MP -MF $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Tpo -c -o cairo_dock-cairo-dock-gauge2.obj `if test -f 'cairo-dock-gauge2.c'; then $(CYGPATH_W) 'cairo-dock-gauge2.c'; else $(CYGPATH_W) '$(srcdir)/cairo-dock-gauge2.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Tpo $(DEPDIR)/cairo_dock-cairo-dock-gauge2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cairo-dock-gauge2.c' object='cairo_dock-cairo-dock-gauge2.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -c -o cairo_dock-cairo-dock-gauge2.obj `if test -f 'cairo-dock-gauge2.c'; then $(CYGPATH_W) 'cairo-dock-gauge2.c'; else $(CYGPATH_W) '$(srcdir)/cairo-dock-gauge2.c'; fi` + cairo_dock-cairo-dock-dock-manager.o: cairo-dock-dock-manager.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cairo_dock_CFLAGS) $(CFLAGS) -MT cairo_dock-cairo-dock-dock-manager.o -MD -MP -MF $(DEPDIR)/cairo_dock-cairo-dock-dock-manager.Tpo -c -o cairo_dock-cairo-dock-dock-manager.o `test -f 'cairo-dock-dock-manager.c' || echo '$(srcdir)/'`cairo-dock-dock-manager.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cairo_dock-cairo-dock-dock-manager.Tpo $(DEPDIR)/cairo_dock-cairo-dock-dock-manager.Po