[Xfce4-commits] r27097 - in xfce4-settings/trunk: dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings po
Author: stephan
Date: 2008-06-21 09:06:02 + (Sat, 21 Jun 2008)
New Revision: 27097
Added:
xfce4-settings/trunk/po/nl.po
Modified:
xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
xfce4-settings/trunk/dialogs/accessibility-settings/main.c
xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
xfce4-settings/trunk/dialogs/appearance-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am
xfce4-settings/trunk/dialogs/keyboard-settings/main.c
xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
xfce4-settings/trunk/dialogs/mouse-settings/main.c
xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
xfce4-settings/trunk/po/ChangeLog
xfce4-settings/trunk/po/LINGUAS
xfce4-settings/trunk/po/POTFILES.in
Log:
Make dialogs translatable
Add Dutch translation
Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
===
--- xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
2008-06-21 01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
2008-06-21 09:06:02 UTC (rev 27097)
@@ -2,7 +2,7 @@
xfce4_accessibility_settings_SOURCES = \
main.c \
- accessibility-dialog.glade.h
+ accessibility-dialog_glade.h
xfce4_accessibility_settings_CFLAGS = \
$(GTK_CFLAGS) \
@@ -29,9 +29,9 @@
if MAINTAINER_MODE
BUILT_SOURCES = \
-accessibility-dialog.glade.h
+accessibility-dialog_glade.h
-accessibility-dialog.glade.h: accessibility-dialog.glade
+accessibility-dialog_glade.h: accessibility-dialog.glade
exo-csource --static --name=accessibility_dialog_glade $ $@
endif
Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c
===
--- xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-21
01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-21
09:06:02 UTC (rev 27097)
@@ -32,7 +32,7 @@
#include libxfcegui4/libxfcegui4.h
#include xfconf/xfconf.h
-#include accessibility-dialog.glade.h
+#include accessibility-dialog_glade.h
typedef struct {
GtkWidget *slave;
Modified: xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
===
--- xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
2008-06-21 01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
2008-06-21 09:06:02 UTC (rev 27097)
@@ -2,7 +2,7 @@
xfce4_appearance_settings_SOURCES = \
main.c \
- appearance-dialog.glade.h
+ appearance-dialog_glade.h
xfce4_appearance_settings_CFLAGS = \
$(GTK_CFLAGS) \
@@ -29,9 +29,9 @@
if MAINTAINER_MODE
BUILT_SOURCES = \
-appearance-dialog.glade.h
+appearance-dialog_glade.h
-appearance-dialog.glade.h: appearance-dialog.glade
+appearance-dialog_glade.h: appearance-dialog.glade
exo-csource --static --name=appearance_dialog_glade $ $@
endif
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-21
01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-21
09:06:02 UTC (rev 27097)
@@ -32,7 +32,7 @@
#include libxfcegui4/libxfcegui4.h
#include xfconf/xfconf.h
-#include appearance-dialog.glade.h
+#include appearance-dialog_glade.h
typedef enum {
THEME_TYPE_ICONS,
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21
01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21
09:06:02 UTC (rev 27097)
@@ -2,7 +2,7 @@
xfce4_keyboard_settings_SOURCES = \
main.c \
- keyboard-dialog.glade.h
+ keyboard-dialog_glade.h
xfce4_keyboard_settings_CFLAGS = \
$(GTK_CFLAGS) \
@@ -29,9 +29,9 @@
if MAINTAINER_MODE
BUILT_SOURCES = \
-keyboard-dialog.glade.h
+keyboard-dialog_glade.h
-keyboard-dialog.glade.h: keyboard-dialog.glade
+keyboard-dialog_glade.h: keyboard-dialog.glade
exo-csource --static --name=keyboard_dialog_glade $ $@
endif
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-06-21
01:07:11 UTC (rev 27096)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-06-21
09:06:02 UTC (rev 27097)
@@ -32,7 +32,7 @@
#include libxfcegui4/libxfcegui4.h
#include xfconf/xfconf.h
-#include keyboard-dialog.glade.h
+#include keyboard-dialog_glade.h
typedef struct
[Xfce4-commits] r27098 - in xfce4-settings/trunk: dialogs dialogs/keyboard-settings po xfce4-settings-helper
Author: stephan
Date: 2008-06-21 11:24:47 + (Sat, 21 Jun 2008)
New Revision: 27098
Added:
xfce4-settings/trunk/dialogs/display-settings/
Modified:
xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
xfce4-settings/trunk/po/nl.po
xfce4-settings/trunk/xfce4-settings-helper/main.c
xfce4-settings/trunk/xfce4-settings-helper/xkb.c
Log:
Fix the keyrepeat-stuff
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2008-06-21 09:06:02 UTC (rev 27097)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2008-06-21 11:24:47 UTC (rev 27098)
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
!DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 15 23:48:00 2008 --
+!--Generated with glade3 3.4.5 on Sat Jun 21 13:21:41 2008 --
glade-interface
requires lib=xfce4/
widget class=GtkDialog id=keyboard-settings-dialog
@@ -140,7 +140,8 @@
widget class=GtkHScale
id=xkb_key_repeat_delay_scale
property
name=visibleTrue/property
property
name=can_focusTrue/property
-property
name=adjustment10 0 100 1 10 10/property
+property
name=adjustment100 100 2000 1 10 10/property
+property
name=digits0/property
property
name=draw_valueFalse/property
/widget
packing
@@ -196,7 +197,7 @@
widget class=GtkHScale
id=xkb_key_repeat_rate_scale
property
name=visibleTrue/property
property
name=can_focusTrue/property
-property
name=adjustment10 0 100 1 10 10/property
+property
name=adjustment10 10 500 1 10 10/property
property
name=draw_valueFalse/property
/widget
packing
Modified: xfce4-settings/trunk/po/nl.po
===
--- xfce4-settings/trunk/po/nl.po 2008-06-21 09:06:02 UTC (rev 27097)
+++ xfce4-settings/trunk/po/nl.po 2008-06-21 11:24:47 UTC (rev 27098)
@@ -144,7 +144,7 @@
#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
msgid Change the looks of your XFCE desktop
-msgstr Verander de uistraling van jouw XFCE bureaublad
+msgstr Verander de uitstraling van jouw XFCE bureaublad
#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
msgid Custom DPI Settings
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-06-21 09:06:02 UTC
(rev 27097)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-06-21 11:24:47 UTC
(rev 27098)
@@ -96,7 +96,7 @@
accessx_channel = xfconf_channel_new(accessx);
-if (xkb_notification_init(accessx_channel))
+if (xkb_notification_init(xkb_channel))
accessx_notification_init(accessx_channel);
if(!debug) /* If not in debug mode, fork to background */
Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.c2008-06-21 09:06:02 UTC
(rev 27097)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.c2008-06-21 11:24:47 UTC
(rev 27098)
@@ -56,6 +56,8 @@
static gboolean xkb_initialized = FALSE;
+#define ALL -1
+
static void
set_repeat (int key, int auto_repeat_mode)
{
@@ -64,7 +66,7 @@
gdk_flush ();
gdk_error_trap_push ();
-if (key != -1)
+if (key != ALL)
{
values.key = key;
XChangeKeyboardControl (GDK_DISPLAY (), KBKey | KBAutoRepeatMode,
values);
@@ -84,19 +86,14 @@
XF86MiscKbdSettings values;
#endif
-g_return_if_fail (rate 0);
-g_return_if_fail (delay 0);
-
#ifdef HAVE_XF86MISC
if (miscpresent)
{
gdk_flush ();
gdk_error_trap_push ();
XF86MiscGetKbdSettings (GDK_DISPLAY (), values);
-if (delay != -1)
-values.delay = delay;
-if (rate != -1)
-values.rate = rate;
+values.delay = delay;
+values.rate =
[Xfce4-commits] r27099 - xfce4-settings/trunk/dialogs/accessibility-settings
Author: stephan Date: 2008-06-21 11:29:47 + (Sat, 21 Jun 2008) New Revision: 27099 Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c Log: Improve 'show' behaviour of accessibility dialog Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c === --- xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-21 11:24:47 UTC (rev 27098) +++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-06-21 11:29:47 UTC (rev 27099) @@ -165,8 +165,7 @@ GtkWidget *dialog = glade_xml_get_widget (gxml, accessibility-settings-dialog); -gtk_widget_show_all(dialog); -gtk_widget_hide(dialog); +gtk_widget_show_all(GTK_DIALOG(dialog)-vbox); return dialog; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27100 - in xfce4-settings/trunk: po xfce4-settings-helper
Author: stephan Date: 2008-06-21 12:14:21 + (Sat, 21 Jun 2008) New Revision: 27100 Modified: xfce4-settings/trunk/po/POTFILES.in xfce4-settings/trunk/po/nl.po xfce4-settings/trunk/xfce4-settings-helper/xkb.c Log: Make sure xfce4-settings-helper helps with the settings :-p Update Dutch translation Modified: xfce4-settings/trunk/po/POTFILES.in === --- xfce4-settings/trunk/po/POTFILES.in 2008-06-21 11:29:47 UTC (rev 27099) +++ xfce4-settings/trunk/po/POTFILES.in 2008-06-21 12:14:21 UTC (rev 27100) @@ -2,3 +2,6 @@ dialogs/appearance-settings/appearance-dialog.glade dialogs/keyboard-settings/keyboard-dialog.glade dialogs/mouse-settings/mouse-dialog.glade +xfce4-settings-helper/accessx.c +xfce4-settings-helper/xkb.c +xfce4-settings-helper/main.c Modified: xfce4-settings/trunk/po/nl.po === --- xfce4-settings/trunk/po/nl.po 2008-06-21 11:29:47 UTC (rev 27099) +++ xfce4-settings/trunk/po/nl.po 2008-06-21 12:14:21 UTC (rev 27100) @@ -3,11 +3,12 @@ # This file is distributed under the same license as the xfce4_settings package. # XFCE [EMAIL PROTECTED], 2008. # +#: ../xfce4-settings-helper/main.c:70 msgid msgstr Project-Id-Version: xfce4_settings 0.0.1-svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-06-21 10:36+0200\n +POT-Creation-Date: 2008-06-21 13:48+0200\n PO-Revision-Date: 2008-06-21 10:38+0200\n Last-Translator: XFCE [EMAIL PROTECTED]\n Language-Team: Dutch\n @@ -18,7 +19,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid bBounce keys/b -msgstr +msgstr bKaatstoetsen/b #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2 msgid bMouse emulation/b @@ -26,11 +27,11 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3 msgid bSlow keys/b -msgstr +msgstr bTrage toetsen/b #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:4 msgid bSticky keys/b -msgstr +msgstr bPlaktoetsen/b #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5 msgid ilong/i @@ -42,7 +43,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7 msgid Acceleration _delay: -msgstr +msgstr Versnellingstijd: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8 msgid Accessibility settings @@ -50,20 +51,19 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9 msgid D_ebounce delay: -msgstr +msgstr Kaatstoetsen vertra_ging: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 msgid Disable sticky keys if _two keys are pressed together -msgstr Plaktoetsen uitschakelen wanneer twee toetsen tegelijk zijn -ingedrukt +msgstr Plaktoetsen uitschakelen wanneer twee toetsen tegelijk zijn ingedrukt #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid Enable Slow _Keys -msgstr +msgstr _Trage toetsen inschakelen #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12 msgid Enable _Bounce Keys -msgstr +msgstr _Kaatstoetsen inschakelen #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13 msgid Enable _Sticky Keys @@ -87,7 +87,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18 msgid Slow Keys _delay: -msgstr +msgstr Trage toetsen v_ertraging: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19 msgid _Delay: @@ -169,6 +169,8 @@ #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13 msgid Please select the UI-theme you want to use msgstr +Selecteer hier het gebruikersinterface-thema dat\n +je wilt gebruiken. #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14 msgid Please select the icon-theme you want to use: @@ -184,7 +186,7 @@ #: ../dialogs/appearance-settings/appearance-dialog.glade.h:17 msgid UI Theme -msgstr Gebruikersinterfacethema +msgstr Gebruikersinterface-thema #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18 msgid _Behaviour @@ -249,7 +251,7 @@ #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 msgid Enable key repeat -msgstr +msgstr Toetsherhaling inschakelen #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 msgid Keyboard settings @@ -257,11 +259,11 @@ #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid Repeat delay: -msgstr +msgstr Herhalingsvertraging: #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid Repeat speed: -msgstr +msgstr Herhalingssnelheid: #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 msgid Shortcuts @@ -297,7 +299,7 @@ #: ../dialogs/mouse-settings/mouse-dialog.glade.h:3 msgid bDouble click/b -msgstr +msgstr bDubbelklikken/b #: ../dialogs/mouse-settings/mouse-dialog.glade.h:4 msgid bDrag and drop/b @@ -326,3 +328,65 @@ #: ../dialogs/mouse-settings/mouse-dialog.glade.h:11 msgid Right handed msgstr Rechtshandig + +#:
[Xfce4-commits] r27102 - in xfce4-settings/trunk/dialogs: accessibility-settings appearance-settings keyboard-settings mouse-settings
Author: stephan Date: 2008-06-21 12:23:16 + (Sat, 21 Jun 2008) New Revision: 27102 Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am Log: Fix install-path of settings-dialogs .desktop files Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-06-21 12:19:17 UTC (rev 27101) +++ xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-06-21 12:23:16 UTC (rev 27102) @@ -36,7 +36,7 @@ endif -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/xfce4/settings-dialogs desktop_in_files = xfce4-accessibility-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ Modified: xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-06-21 12:19:17 UTC (rev 27101) +++ xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-06-21 12:23:16 UTC (rev 27102) @@ -36,7 +36,7 @@ endif -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/xfce4/settings-dialogs desktop_in_files = xfce4-appearance-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ Modified: xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21 12:19:17 UTC (rev 27101) +++ xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21 12:23:16 UTC (rev 27102) @@ -36,7 +36,7 @@ endif -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/xfce4/settings-dialogs desktop_in_files = xfce4-keyboard-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ Modified: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-06-21 12:19:17 UTC (rev 27101) +++ xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-06-21 12:23:16 UTC (rev 27102) @@ -1,5 +1,4 @@ bin_PROGRAMS = xfce4-mouse-settings - xfce4_mouse_settings_SOURCES = \ main.c \ mouse-dialog_glade.h @@ -36,7 +35,7 @@ endif -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/xfce4/settings-dialogs desktop_in_files = xfce4-mouse-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27103 - xfce4-settings/trunk/po
Author: stephan Date: 2008-06-21 12:30:12 + (Sat, 21 Jun 2008) New Revision: 27103 Modified: xfce4-settings/trunk/po/POTFILES.in xfce4-settings/trunk/po/nl.po Log: Update POTFILES.in Update .po files Modified: xfce4-settings/trunk/po/POTFILES.in === --- xfce4-settings/trunk/po/POTFILES.in 2008-06-21 12:23:16 UTC (rev 27102) +++ xfce4-settings/trunk/po/POTFILES.in 2008-06-21 12:30:12 UTC (rev 27103) @@ -1,7 +1,17 @@ dialogs/accessibility-settings/accessibility-dialog.glade +dialogs/accessibility-settings/main.c +dialogs/accessibility-settings/xfce4-accessibility-settings.desktop dialogs/appearance-settings/appearance-dialog.glade +dialogs/appearance-settings/main.c +dialogs/appearance-settings/xfce4-appearance-settings.desktop dialogs/keyboard-settings/keyboard-dialog.glade +dialogs/keyboard-settings/main.c +dialogs/keyboard-settings/xfce4-keyboard-settings.desktop +dialogs/mouse-settings/main.c dialogs/mouse-settings/mouse-dialog.glade +dialogs/mouse-settings/xfce4-mouse-settings.desktop xfce4-settings-helper/accessx.c +xfce4-settings-helper/main.c xfce4-settings-helper/xkb.c -xfce4-settings-helper/main.c +xfce4-settings-manager/main.c +xfce4-settings-manager/xfce-settings-manager-dialog.c Modified: xfce4-settings/trunk/po/nl.po === --- xfce4-settings/trunk/po/nl.po 2008-06-21 12:23:16 UTC (rev 27102) +++ xfce4-settings/trunk/po/nl.po 2008-06-21 12:30:12 UTC (rev 27103) @@ -8,7 +8,7 @@ msgstr Project-Id-Version: xfce4_settings 0.0.1-svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-06-21 13:48+0200\n +POT-Creation-Date: 2008-06-21 14:29+0200\n PO-Revision-Date: 2008-06-21 10:38+0200\n Last-Translator: XFCE [EMAIL PROTECTED]\n Language-Team: Dutch\n @@ -118,6 +118,29 @@ msgid gtk-help msgstr +#: ../dialogs/accessibility-settings/main.c:47 +#: ../dialogs/appearance-settings/main.c:52 +#: ../dialogs/keyboard-settings/main.c:47 ../dialogs/mouse-settings/main.c:47 +#: ../xfce4-settings-helper/main.c:51 +msgid Version information +msgstr Versie-informatie + +#: ../dialogs/accessibility-settings/main.c:184 +#: ../dialogs/appearance-settings/main.c:733 +#: ../dialogs/keyboard-settings/main.c:126 ../dialogs/mouse-settings/main.c:78 +msgid . +msgstr + +#: ../dialogs/accessibility-settings/main.c:188 +#: ../dialogs/appearance-settings/main.c:737 +#: ../dialogs/keyboard-settings/main.c:130 ../dialogs/mouse-settings/main.c:82 +#: ../xfce4-settings-helper/main.c:74 +#, c-format +msgid +%s: %s\n +Try %s --help to see a full list of available command line options.\n +msgstr + #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1 msgid bAntialias Fonts/b msgstr @@ -212,6 +235,67 @@ msgid _Themes msgstr _Thema's +#: ../dialogs/appearance-settings/main.c:523 +#, fuzzy +msgid Icon theme name +msgstr Pictogrammenthema + +#: ../dialogs/appearance-settings/main.c:535 +msgid Theme name +msgstr + +#: ../dialogs/appearance-settings/main.c:546 +msgid Icons +msgstr + +#: ../dialogs/appearance-settings/main.c:548 +msgid Text +msgstr + +#: ../dialogs/appearance-settings/main.c:550 +msgid Both +msgstr + +#: ../dialogs/appearance-settings/main.c:552 +msgid Both Horizontal +msgstr + +#: ../dialogs/appearance-settings/main.c:565 +msgid No Hinting +msgstr + +#: ../dialogs/appearance-settings/main.c:567 +msgid Slight Hinting +msgstr + +#: ../dialogs/appearance-settings/main.c:569 +msgid Medium Hinting +msgstr + +#: ../dialogs/appearance-settings/main.c:571 +msgid Full Hinting +msgstr + +#: ../dialogs/appearance-settings/main.c:583 +msgid none +msgstr + +#: ../dialogs/appearance-settings/main.c:585 +msgid rgb +msgstr + +#: ../dialogs/appearance-settings/main.c:587 +msgid bgr +msgstr + +#: ../dialogs/appearance-settings/main.c:589 +msgid vrgb +msgstr + +#: ../dialogs/appearance-settings/main.c:591 +msgid vbgr +msgstr + #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:1 msgid bCursor/b msgstr @@ -376,17 +460,20 @@ msgid Accessibility settings changed msgstr Toegankelijkheidsinstellingen zijn veranderd -#: ../xfce4-settings-helper/main.c:51 -msgid Version information -msgstr Versie-informatie - #: ../xfce4-settings-helper/main.c:55 msgid Start in debug mode (don't fork to the background) msgstr -#: ../xfce4-settings-helper/main.c:74 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:99 +msgid Customize your Xfce desktop +msgstr + +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:100 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:302 +msgid Xfce Settings Manager +msgstr + +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:301 #, c-format -msgid -%s: %s\n -Try %s --help to see a full list of available command line options.\n +msgid Unable to start \%s\ msgstr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org
[Xfce4-commits] r27104 - xfce4-settings/trunk/po
Author: stephan Date: 2008-06-21 12:31:48 + (Sat, 21 Jun 2008) New Revision: 27104 Modified: xfce4-settings/trunk/po/nl.po Log: Fix accelerators Modified: xfce4-settings/trunk/po/nl.po === --- xfce4-settings/trunk/po/nl.po 2008-06-21 12:30:12 UTC (rev 27103) +++ xfce4-settings/trunk/po/nl.po 2008-06-21 12:31:48 UTC (rev 27104) @@ -43,7 +43,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7 msgid Acceleration _delay: -msgstr Versnellingstijd: +msgstr Versnellings_tijd: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8 msgid Accessibility settings @@ -55,7 +55,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 msgid Disable sticky keys if _two keys are pressed together -msgstr Plaktoetsen uitschakelen wanneer twee toetsen tegelijk zijn ingedrukt +msgstr Plaktoetsen uitschakelen wanneer _twee toetsen tegelijk zijn ingedrukt #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid Enable Slow _Keys ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27105 - in xfce4-mixer/trunk: . panel-plugin xfce4-mixer
Author: jannis
Date: 2008-06-21 12:38:04 + (Sat, 21 Jun 2008)
New Revision: 27105
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* panel-plugin/xfce-mixer-plugin.c: Add support for
xfce_mixer_card_connect() so that the volume button is updated
whenever the volume of the current mixer track is changed by
another program.
* panel-plugin/xfce-mixer.c: Parse GST_MESSAGE_VOLUME_CHANGED
messages, but don't handle them yet. In the mixer it's much more
complicated than in the plugin, gonna do that later.
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 12:31:48 UTC (rev 27104)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 12:38:04 UTC (rev 27105)
@@ -1,5 +1,15 @@
2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+ * panel-plugin/xfce-mixer-plugin.c: Add support for
+ xfce_mixer_card_connect() so that the volume button is updated
+ whenever the volume of the current mixer track is changed by
+ another program.
+ * panel-plugin/xfce-mixer.c: Parse GST_MESSAGE_VOLUME_CHANGED
+ messages, but don't handle them yet. In the mixer it's much more
+ complicated than in the plugin, gonna do that later.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* icons/: Add volume level icons (1x muted, 5x different sound
wave icons). I'm not exactly satisfied, but it's better than
before.
Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 12:31:48 UTC
(rev 27104)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 12:38:04 UTC
(rev 27105)
@@ -77,6 +77,11 @@
static void xfce_mixer_plugin_replace_values (XfceMixerPlugin
*mixer_plugin,
const gchar
*card_name,
const gchar
*track_name);
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+static gboolean xfce_mixer_plugin_bus_message(GstBus
*bus,
+ GstMessage
*message,
+ XfceMixerPlugin
*mixer_plugin);
+#endif
@@ -359,6 +364,10 @@
g_object_unref (G_OBJECT (mixer_plugin-track));
mixer_plugin-card = XFCE_MIXER_CARD (xfce_mixer_utilities_get_card_by_name
(mixer_plugin-card_name));
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+ xfce_mixer_card_connect (mixer_plugin-card, G_CALLBACK
(xfce_mixer_plugin_bus_message), mixer_plugin);
+#endif
+
mixer_plugin-track = xfce_mixer_card_get_track_by_name (mixer_plugin-card,
mixer_plugin-track_name);
volumes = g_new (gint, mixer_plugin-track-num_channels);
@@ -389,3 +398,34 @@
mixer_plugin-card_name = g_strdup (card_name);
mixer_plugin-track_name = g_strdup (track_name);
}
+
+
+
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+static gboolean
+xfce_mixer_plugin_bus_message (GstBus *bus,
+ GstMessage *message,
+ XfceMixerPlugin *mixer_plugin)
+{
+ GstMixerTrack *track = NULL;
+ gdouble volume;
+ gint *volumes;
+ gintnum_channels;
+
+ if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card,
message)))
+return TRUE;
+
+ g_debug (Message from card received: %s, GST_MESSAGE_TYPE_NAME (message));
+
+ if (G_LIKELY (gst_mixer_message_get_type (message) ==
GST_MIXER_MESSAGE_VOLUME_CHANGED))
+{
+ gst_mixer_message_parse_volume_changed (message, track, volumes,
num_channels);
+
+ if (G_UNLIKELY (g_utf8_collate (track-label,
mixer_plugin-track-label) == 0))
+{
+ volume = ((gdouble) volumes[0]) / mixer_plugin-track-max_volume;
+ xfce_volume_button_set_volume (XFCE_VOLUME_BUTTON
(mixer_plugin-button), volume);
+}
+}
+}
+#endif
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-21 12:31:48 UTC (rev
27104)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-21 12:38:04 UTC (rev
27105)
@@ -321,6 +321,8 @@
gbooleanmuted;
gbooleanrecord;
const gchar*option;
+ gint *volumes;
+ gintnum_channels;
if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer-card, message)))
return TRUE;
@@ -341,6 +343,8 @@
}
else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED)
{
+ gst_mixer_message_parse_volume_changed (message, track, volumes,
num_channels);
+ g_debug
[Xfce4-commits] r27106 - in xfce4-mixer/trunk: . panel-plugin
Author: jannis
Date: 2008-06-21 12:57:24 + (Sat, 21 Jun 2008)
New Revision: 27106
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/TODO
xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
xfce4-mixer/trunk/panel-plugin/xfce-volume-button.h
Log:
* panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled
signal for when the middle mouse button is clicked. Add
xfce_volume_button_set_muted() method for manually changing
the mute state of the button (does not affect the actual sound
settings).
* panel-plugin/xfce-mixer-plugin.c: Handle
GST_MESSAGE_MUTE_TOGGLED messages by setting the muted state
of the plugin button.
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 12:38:04 UTC (rev 27105)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 12:57:24 UTC (rev 27106)
@@ -1,5 +1,16 @@
2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+ * panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled
+ signal for when the middle mouse button is clicked. Add
+ xfce_volume_button_set_muted() method for manually changing
+ the mute state of the button (does not affect the actual sound
+ settings).
+ * panel-plugin/xfce-mixer-plugin.c: Handle
+ GST_MESSAGE_MUTE_TOGGLED messages by setting the muted state
+ of the plugin button.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-mixer-plugin.c: Add support for
xfce_mixer_card_connect() so that the volume button is updated
whenever the volume of the current mixer track is changed by
Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO 2008-06-21 12:38:04 UTC (rev 27105)
+++ xfce4-mixer/trunk/TODO 2008-06-21 12:57:24 UTC (rev 27106)
@@ -3,8 +3,5 @@
2) Extend xfce_mixer_bus_message() to handle all types of messages
by updating the corresponding mixer widgets
-* Write panel plugin
- 1) Monitor GStreamer for changes
-
* Allow changing controls from the console, probably via something like:
--change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE
Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 12:38:04 UTC
(rev 27105)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 12:57:24 UTC
(rev 27106)
@@ -69,6 +69,8 @@
gint
size);
static void xfce_mixer_plugin_volume_changed (XfceMixerPlugin
*mixer_plugin,
gdouble
volume);
+static void xfce_mixer_plugin_mute_toggled (XfceMixerPlugin
*mixer_plugin,
+ gboolean
mute);
static void xfce_mixer_plugin_configure (XfceMixerPlugin
*mixer_plugin);
static void xfce_mixer_plugin_clicked(XfceMixerPlugin
*mixer_plugin);
static void xfce_mixer_plugin_read_config(XfceMixerPlugin
*mixer_plugin);
@@ -113,6 +115,7 @@
mixer_plugin-button = xfce_volume_button_new ();
xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-button);
g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), volume-changed,
G_CALLBACK (xfce_mixer_plugin_volume_changed), mixer_plugin);
+ g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), mute-toggled,
G_CALLBACK (xfce_mixer_plugin_mute_toggled), mixer_plugin);
g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), clicked,
G_CALLBACK (xfce_mixer_plugin_clicked), mixer_plugin);
gtk_container_add (GTK_CONTAINER (mixer_plugin-hvbox),
mixer_plugin-button);
gtk_widget_show (mixer_plugin-button);
@@ -224,6 +227,19 @@
static void
+xfce_mixer_plugin_mute_toggled (XfceMixerPlugin *mixer_plugin,
+gboolean mute)
+{
+ g_return_if_fail (mixer_plugin != NULL);
+ g_return_if_fail (IS_XFCE_MIXER_CARD (mixer_plugin-card));
+ g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
+
+ xfce_mixer_card_set_track_muted (mixer_plugin-card, mixer_plugin-track,
mute);
+}
+
+
+
+static void
xfce_mixer_plugin_clicked (XfceMixerPlugin *mixer_plugin)
{
g_return_if_fail (mixer_plugin != NULL);
@@ -411,21 +427,30 @@
gdouble volume;
gint *volumes;
gintnum_channels;
+ gbooleanmute;
if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card,
message)))
return TRUE;
g_debug (Message from card received: %s, GST_MESSAGE_TYPE_NAME (message));
- if (G_LIKELY
[Xfce4-commits] r27107 - in xfce4-settings/trunk: . po
Author: stephan Date: 2008-06-21 13:34:10 + (Sat, 21 Jun 2008) New Revision: 27107 Modified: xfce4-settings/trunk/AUTHORS xfce4-settings/trunk/po/nl.po Log: Update AUTHORS file Update Dutch translation Modified: xfce4-settings/trunk/AUTHORS === --- xfce4-settings/trunk/AUTHORS2008-06-21 12:57:24 UTC (rev 27106) +++ xfce4-settings/trunk/AUTHORS2008-06-21 13:34:10 UTC (rev 27107) @@ -1 +1,2 @@ Stephan Arts [EMAIL PROTECTED] +Brian J. Tarricone [EMAIL PROTECTED] Modified: xfce4-settings/trunk/po/nl.po === --- xfce4-settings/trunk/po/nl.po 2008-06-21 12:57:24 UTC (rev 27106) +++ xfce4-settings/trunk/po/nl.po 2008-06-21 13:34:10 UTC (rev 27107) @@ -1,21 +1,23 @@ +# translation of xfce4-settings.po to Nederlands # Dutch translations for xfce4_settings package. # Copyright (C) 2008 THE xfce4_settings'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4_settings package. -# XFCE [EMAIL PROTECTED], 2008. # #: ../xfce4-settings-helper/main.c:70 +# XFCE [EMAIL PROTECTED], 2008. +# Balaam's Miracle [EMAIL PROTECTED], 2008. msgid msgstr -Project-Id-Version: xfce4_settings 0.0.1-svn\n +Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2008-06-21 14:29+0200\n -PO-Revision-Date: 2008-06-21 10:38+0200\n -Last-Translator: XFCE [EMAIL PROTECTED]\n -Language-Team: Dutch\n +PO-Revision-Date: 2008-06-21 15:11+0200\n +Last-Translator: Stephan Arts [EMAIL PROTECTED]\n +Language-Team: Nederlands [EMAIL PROTECTED]\n MIME-Version: 1.0\n -Content-Type: text/plain; charset=ASCII\n +Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=2; plural=(n != 1);\n +Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid bBounce keys/b @@ -23,7 +25,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2 msgid bMouse emulation/b -msgstr +msgstr bMuis-emulatie/b #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3 msgid bSlow keys/b @@ -87,7 +89,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18 msgid Slow Keys _delay: -msgstr Trage toetsen v_ertraging: +msgstr V_ertraging voor trage toetsen: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19 msgid _Delay: @@ -95,11 +97,11 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 msgid _Enable mouse emulation -msgstr +msgstr Muis-_emulatie inschakelen #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 msgid _Interval: -msgstr +msgstr _Interval: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 msgid _Latch mode @@ -116,7 +118,7 @@ #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13 msgid gtk-help -msgstr +msgstr gtk-help #: ../dialogs/accessibility-settings/main.c:47 #: ../dialogs/appearance-settings/main.c:52 @@ -129,7 +131,7 @@ #: ../dialogs/appearance-settings/main.c:733 #: ../dialogs/keyboard-settings/main.c:126 ../dialogs/mouse-settings/main.c:78 msgid . -msgstr +msgstr . #: ../dialogs/accessibility-settings/main.c:188 #: ../dialogs/appearance-settings/main.c:737 @@ -140,10 +142,13 @@ %s: %s\n Try %s --help to see a full list of available command line options.\n msgstr +%s: %s\n +Probeer %s --help om een complete lijst van beschikbare commandoregel-\n +opties te zien.\n #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1 msgid bAntialias Fonts/b -msgstr +msgstr bLettertypen gladmaken/b #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2 msgid bDPI/b @@ -171,19 +176,19 @@ #: ../dialogs/appearance-settings/appearance-dialog.glade.h:8 msgid Custom DPI Settings -msgstr +msgstr Aangepaste DPI-instellingen #: ../dialogs/appearance-settings/appearance-dialog.glade.h:9 msgid Enable _button-images -msgstr +msgstr Knop-af_beeldingen inschakelen #: ../dialogs/appearance-settings/appearance-dialog.glade.h:10 msgid Enable e_ditable menuaccelerators -msgstr +msgstr Be_werkbare menu-sneltoetsen inschakelen #: ../dialogs/appearance-settings/appearance-dialog.glade.h:11 msgid Enable menu-_images -msgstr +msgstr Menuafbeeld_ingen inschakelen #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12 msgid Icon theme @@ -192,20 +197,20 @@ #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13 msgid Please select the UI-theme you want to use msgstr -Selecteer hier het gebruikersinterface-thema dat\n -je wilt gebruiken. +Kies het gebruikersinterface-thema dat u\n +wilt gebruiken #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14 msgid Please select the icon-theme you want to use: -msgstr +msgstr Kies het pictogrammenthema dat u wilt
[Xfce4-commits] r27108 - xfce4-settings/trunk/po
Author: stephan Date: 2008-06-21 13:41:27 + (Sat, 21 Jun 2008) New Revision: 27108 Modified: xfce4-settings/trunk/po/nl.po Log: Improve a few lines in the dutch translation Modified: xfce4-settings/trunk/po/nl.po === --- xfce4-settings/trunk/po/nl.po 2008-06-21 13:34:10 UTC (rev 27107) +++ xfce4-settings/trunk/po/nl.po 2008-06-21 13:41:27 UTC (rev 27108) @@ -53,7 +53,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9 msgid D_ebounce delay: -msgstr Kaatstoetsen vertra_ging: +msgstr V_ertraging voor kaatstoetsen: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 msgid Disable sticky keys if _two keys are pressed together @@ -89,7 +89,7 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18 msgid Slow Keys _delay: -msgstr V_ertraging voor trage toetsen: +msgstr Ve_rtraging voor trage toetsen: #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19 msgid _Delay: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27110 - xfce4-mixer/trunk/po
Author: stephan Date: 2008-06-21 14:07:15 + (Sat, 21 Jun 2008) New Revision: 27110 Added: xfce4-mixer/trunk/po/nl.po Log: Add nl.po file :p Added: xfce4-mixer/trunk/po/nl.po === --- xfce4-mixer/trunk/po/nl.po (rev 0) +++ xfce4-mixer/trunk/po/nl.po 2008-06-21 14:07:15 UTC (rev 27110) @@ -0,0 +1,87 @@ +# Dutch translations for xfce4-mixer package. +# Copyright (C) 2008 THE xfce4-mixer'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-mixer package. +# XFCE [EMAIL PROTECTED], 2008. +# +msgid +msgstr +Project-Id-Version: xfce4-mixer 4.5.0svn-r\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2008-06-21 15:45+0200\n +PO-Revision-Date: 2008-06-21 15:45+0200\n +Last-Translator: XFCE [EMAIL PROTECTED]\n +Language-Team: Dutch\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Plural-Forms: nplurals=2; plural=(n != 1);\n + +#. Set application name +#: ../xfce4-mixer/main.c:75 ../xfce4-mixer/xfce-mixer-window.c:180 +#: ../xfce4-mixer/xfce-mixer-window.c:198 +#: ../xfce4-mixer/xfce-mixer-window.c:301 +#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2 +msgid Xfce Mixer +msgstr Xfce volumeregelaar + +#: ../xfce4-mixer/xfce-mixer.c:167 +msgid Playback +msgstr Afspelen + +#: ../xfce4-mixer/xfce-mixer.c:167 +msgid Capture +msgstr Opnemen + +#: ../xfce4-mixer/xfce-mixer.c:167 +msgid Switches +msgstr Schakelaars + +#: ../xfce4-mixer/xfce-mixer.c:167 +msgid Options +msgstr Opties + +#: ../xfce4-mixer/xfce-mixer.c:298 +msgid No Controls Visible +msgstr + +#: ../xfce4-mixer/xfce-mixer.c:302 +msgid +No controls are marked as visible. Please open the span +size='large'bSelect Controls/b/span dialog to select some. +msgstr + +#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:129 +msgid Select Controls +msgstr + +#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:131 +msgid Please select which controls you want to be visible +msgstr + +#: ../xfce4-mixer/xfce-mixer-window.c:92 +msgid _Quit +msgstr Af_sluiten + +#: ../xfce4-mixer/xfce-mixer-window.c:92 +msgid Exit Xfce Mixer +msgstr Xfce volumeregelaar afsluiten + +#: ../xfce4-mixer/xfce-mixer-window.c:94 +msgid _Select Controls... +msgstr + +#: ../xfce4-mixer/xfce-mixer-window.c:94 +msgid Select which controls are displayed +msgstr + +#: ../xfce4-mixer/xfce-mixer-window.c:199 +msgid A comfortable audio mixer for your sound card. +msgstr Een comfortabele volumeregelaar voor uw geluidskaart. + +#: ../xfce4-mixer/xfce-mixer-window.c:214 +msgid Sound card: +msgstr Geluidskaart: + +#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1 +msgid Audio mixer for the Xfce Desktop Environment +msgstr Volumeregelaar voor de Xfce bureaublad omgeving ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27111 - xfwm4/trunk/src
Author: olivier
Date: 2008-06-21 15:17:00 + (Sat, 21 Jun 2008)
New Revision: 27111
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/menu.c
xfwm4/trunk/src/menu.h
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/netwm.h
Log:
Rework the window menu, add more actions (above/normal/below,
fullscreen/un-fullscreen)
Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2008-06-21 14:07:15 UTC (rev 27110)
+++ xfwm4/trunk/src/client.c2008-06-21 15:17:00 UTC (rev 27111)
@@ -1144,12 +1144,12 @@
if (FLAG_TEST_AND_NOT (c-flags, CLIENT_FLAG_ABOVE, CLIENT_FLAG_BELOW))
{
TRACE (Applying client's initial state: above);
-clientUpdateAboveState (c);
+clientUpdateLayerState (c);
}
if (FLAG_TEST_AND_NOT (c-flags, CLIENT_FLAG_BELOW, CLIENT_FLAG_ABOVE))
{
TRACE (Applying client's initial state: below);
-clientUpdateBelowState (c);
+clientUpdateLayerState (c);
}
if (FLAG_TEST (c-flags, CLIENT_FLAG_STICKY)
FLAG_TEST (c-xfwm_flags, XFWM_FLAG_HAS_STICK))
@@ -2678,40 +2678,53 @@
}
}
-if (!clientIsValidTransientOrModal (c) (c-type == WINDOW_NORMAL))
+if (!clientIsTransientOrModal (c) (c-type == WINDOW_NORMAL))
{
FLAG_TOGGLE (c-flags, CLIENT_FLAG_FULLSCREEN);
clientUpdateFullscreenState (c);
}
}
-void clientToggleAbove (Client * c)
+void clientToggleLayerAbove (Client * c)
{
g_return_if_fail (c != NULL);
TRACE (entering clientToggleAbove);
-TRACE (toggle above client \%s\ (0x%lx), c-name, c-window);
-if (!clientIsValidTransientOrModal (c)
-!FLAG_TEST (c-flags, CLIENT_FLAG_BELOW | CLIENT_FLAG_FULLSCREEN))
+if (!clientIsTransientOrModal (c)
+!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
+FLAG_UNSET (c-flags, CLIENT_FLAG_BELOW);
FLAG_TOGGLE (c-flags, CLIENT_FLAG_ABOVE);
-clientUpdateAboveState (c);
+clientUpdateLayerState (c);
}
}
-void clientToggleBelow (Client * c)
+void clientToggleLayerBelow (Client * c)
{
g_return_if_fail (c != NULL);
TRACE (entering clientToggleBelow);
-TRACE (toggle below client \%s\ (0x%lx), c-name, c-window);
-if (!FLAG_TEST (c-flags, CLIENT_FLAG_ABOVE))
+if (!clientIsTransientOrModal (c)
+!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
+FLAG_UNSET (c-flags, CLIENT_FLAG_ABOVE);
FLAG_TOGGLE (c-flags, CLIENT_FLAG_BELOW);
-clientUpdateAboveState (c);
+clientUpdateLayerState (c);
}
}
+void clientSetLayerNormal (Client * c)
+{
+g_return_if_fail (c != NULL);
+TRACE (entering clientSetLayerNormal);
+
+if (!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
+{
+FLAG_UNSET (c-flags, CLIENT_FLAG_ABOVE | CLIENT_FLAG_BELOW);
+clientUpdateLayerState (c);
+}
+}
+
void
clientRemoveMaximizeFlag (Client * c)
{
Modified: xfwm4/trunk/src/client.h
===
--- xfwm4/trunk/src/client.h2008-06-21 14:07:15 UTC (rev 27110)
+++ xfwm4/trunk/src/client.h2008-06-21 15:17:00 UTC (rev 27111)
@@ -384,8 +384,9 @@
void clientToggleSticky (Client *,
gboolean);
void clientToggleFullscreen (Client *);
-void clientToggleAbove (Client *);
-void clientToggleBelow (Client *);
+void clientToggleLayerAbove (Client *);
+void clientToggleLayerBelow (Client *);
+void clientSetLayerNormal (Client *);
void clientRemoveMaximizeFlag (Client *);
void clientToggleMaximized (Client *,
int,
Modified: xfwm4/trunk/src/events.c
===
--- xfwm4/trunk/src/events.c2008-06-21 14:07:15 UTC (rev 27110)
+++ xfwm4/trunk/src/events.c2008-06-21 15:17:00 UTC (rev 27111)
@@ -383,7 +383,7 @@
clientLower (c, None);
break;
case KEY_TOGGLE_ABOVE:
-clientToggleAbove (c);
+clientToggleLayerAbove (c);
break;
case KEY_TOGGLE_FULLSCREEN:
clientToggleFullscreen (c);
@@ -2519,7 +2519,6 @@
{
clientHide (c, c-win_workspace, TRUE);
}
-frameQueueDraw (c, FALSE);
break;
case MENU_OP_MOVE:
clientMove (c, NULL);
@@ -2529,7 +2528,6 @@
[Xfce4-commits] r27112 - in xfce4-mixer/trunk: libxfce4mixer panel-plugin
Author: jannis
Date: 2008-06-21 15:47:44 + (Sat, 21 Jun 2008)
New Revision: 27112
Modified:
xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
Log:
Add some debugging output for Moe.
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21
15:17:00 UTC (rev 27111)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21
15:47:44 UTC (rev 27112)
@@ -209,6 +209,8 @@
g_return_if_fail (IS_XFCE_MIXER_TRACK_COMBO (combo));
+ g_message (set_soundcard: combo-track_name = %s, combo-track_name);
+
if (G_LIKELY (combo-card != NULL))
g_object_unref (G_OBJECT (combo-card));
@@ -238,11 +240,18 @@
NAME_COLUMN, GST_MIXER_TRACK
(titer-data)-label,
TRACK_COLUMN, GST_MIXER_TRACK (titer-data), -1);
+ g_message (compare %s to %s, combo-track_name, GST_MIXER_TRACK
(titer-data)-label);
+
if (G_UNLIKELY (combo-track_name != NULL g_utf8_collate
(GST_MIXER_TRACK (titer-data)-label, combo-track_name) == 0))
-active_index = counter;
+{
+ g_message (equal = active_index = %i, counter);
+ active_index = counter;
+}
}
}
+ g_message (active_index = %i, active_index);
+
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active_index);
}
Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 15:17:00 UTC
(rev 27111)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-21 15:47:44 UTC
(rev 27112)
@@ -188,6 +188,8 @@
size -= 2 + 2 * MAX (mixer_plugin-button-style-xthickness,
mixer_plugin-button-style-ythickness);
+ g_message (icon size = %i, size);
+
xfce_volume_button_set_icon_size (XFCE_VOLUME_BUTTON (mixer_plugin-button),
size);
xfce_volume_button_update (XFCE_VOLUME_BUTTON (mixer_plugin-button));
@@ -253,22 +255,22 @@
static void
xfce_mixer_plugin_configure (XfceMixerPlugin *mixer_plugin)
{
- XfceMixerCard *card;
- GstMixerTrack *track;
+ XfceMixerCard *card = NULL;
+ GstMixerTrack *track = NULL;
GtkWidget *dialog;
g_return_if_fail (mixer_plugin != NULL);
xfce_panel_plugin_block_menu (mixer_plugin-plugin);
+ g_message (mixer_plugin-card_name = %s, mixer_plugin-track_name = %s,
mixer_plugin-card_name, mixer_plugin-track_name);
+
dialog = xfce_plugin_dialog_new (mixer_plugin-card_name,
mixer_plugin-track_name);
gtk_dialog_run (GTK_DIALOG (dialog));
xfce_plugin_dialog_get_data (XFCE_PLUGIN_DIALOG (dialog), card, track);
- gtk_widget_destroy (dialog);
-
if (G_LIKELY (IS_XFCE_MIXER_CARD (card) GST_IS_MIXER_TRACK (track)))
{
g_message (Changed to card %s and track %s,
xfce_mixer_card_get_display_name (card), GST_MIXER_TRACK (track)-label);
@@ -280,6 +282,8 @@
xfce_mixer_plugin_update_track (mixer_plugin);
}
+ gtk_widget_destroy (dialog);
+
xfce_panel_plugin_unblock_menu (mixer_plugin-plugin);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27113 - in xfce4-mixer/trunk: . libxfce4mixer
Author: jannis
Date: 2008-06-21 15:58:21 + (Sat, 21 Jun 2008)
New Revision: 27113
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
Log:
* libxfce4mixer/xfce-mixer-track-combo.c: Increment the counter
for determining the active track index only when playback
and capture tracks are found.
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 15:47:44 UTC (rev 27112)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 15:58:21 UTC (rev 27113)
@@ -1,5 +1,11 @@
2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+ * libxfce4mixer/xfce-mixer-track-combo.c: Increment the counter
+ for determining the active track index only when playback
+ and capture tracks are found.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled
signal for when the middle mouse button is clicked. Add
xfce_volume_button_set_muted() method for manually changing
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21
15:47:44 UTC (rev 27112)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21
15:58:21 UTC (rev 27113)
@@ -229,7 +229,7 @@
gtk_list_store_clear (combo-model);
- for (titer = xfce_mixer_card_get_tracks (combo-card), counter = 0; titer !=
NULL; titer = g_list_next (titer), ++counter)
+ for (titer = xfce_mixer_card_get_tracks (combo-card), counter = 0; titer !=
NULL; titer = g_list_next (titer))
{
type = xfce_mixer_track_type_new (titer-data);
@@ -247,6 +247,8 @@
g_message (equal = active_index = %i, counter);
active_index = counter;
}
+
+ ++counter;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27117 - xfwm4/trunk/mcs-plugin
Author: olivier Date: 2008-06-21 22:15:31 + (Sat, 21 Jun 2008) New Revision: 27117 Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c Log: Add missing bits of patch from bug #3595 Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c === --- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2008-06-21 18:10:10 UTC (rev 27116) +++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2008-06-21 22:15:31 UTC (rev 27117) @@ -348,7 +348,9 @@ prev_workspace_key, next_workspace_key, add_workspace_key, +add_adjacent_workspace_key, del_workspace_key, +del_active_workspace_key, NULL }; @@ -390,7 +392,9 @@ N_(Previous workspace), N_(Next workspace), N_(Add workspace), -N_(Delete workspace), +N_(Add adjacent workspace), +N_(Delete last workspace), +N_(Delete active workspace), NULL }; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27118 - in xfce4-settings/trunk/dialogs: accessibility-settings appearance-settings keyboard-settings mouse-settings
Author: stephan Date: 2008-06-21 22:27:50 + (Sat, 21 Jun 2008) New Revision: 27118 Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am Log: Fix install paths of .desktop-files Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-06-21 22:15:31 UTC (rev 27117) +++ xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-06-21 22:27:50 UTC (rev 27118) @@ -36,9 +36,13 @@ endif -desktopdir = $(datadir)/xfce4/settings-dialogs +desktopdir = $(datadir)/applications desktop_in_files = xfce4-accessibility-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +settingsdir = $(datadir)/xfce4/settings-dialogs +settings_DATA = $(desktop_DATA) + @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ Modified: xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-06-21 22:15:31 UTC (rev 27117) +++ xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-06-21 22:27:50 UTC (rev 27118) @@ -36,9 +36,13 @@ endif -desktopdir = $(datadir)/xfce4/settings-dialogs +desktopdir = $(datadir)/applications desktop_in_files = xfce4-appearance-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +settingsdir = $(datadir)/xfce4/settings-dialogs +settings_DATA = $(desktop_DATA) + @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ Modified: xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21 22:15:31 UTC (rev 27117) +++ xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-06-21 22:27:50 UTC (rev 27118) @@ -36,9 +36,13 @@ endif -desktopdir = $(datadir)/xfce4/settings-dialogs +desktopdir = $(datadir)/applications desktop_in_files = xfce4-keyboard-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +settingsdir = $(datadir)/xfce4/settings-dialogs +settings_DATA = $(desktop_DATA) + @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ Modified: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am === --- xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-06-21 22:15:31 UTC (rev 27117) +++ xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-06-21 22:27:50 UTC (rev 27118) @@ -35,9 +35,13 @@ endif -desktopdir = $(datadir)/xfce4/settings-dialogs +desktopdir = $(datadir)/applications desktop_in_files = xfce4-mouse-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +settingsdir = $(datadir)/xfce4/settings-dialogs +settings_DATA = $(desktop_DATA) + @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27119 - in xfce4-mixer/trunk: . xfce4-mixer
Author: jannis
Date: 2008-06-22 01:00:20 + (Sun, 22 Jun 2008)
New Revision: 27119
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.h
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.h
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer-track.{c,h},
xfce4-mixer/xfce-mixer-option.{c,h},
xfce4-mixer/xfce-mixer-switch.{c,h},
xfce4-mixer/xfce-mixer.c: Implement monitoring for mute,
record, volume, option and switch changes on all controls.
Works like a charm!
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 22:27:50 UTC (rev 27118)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 01:00:20 UTC (rev 27119)
@@ -1,3 +1,12 @@
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
+ * xfce4-mixer/xfce-mixer-track.{c,h},
+ xfce4-mixer/xfce-mixer-option.{c,h},
+ xfce4-mixer/xfce-mixer-switch.{c,h},
+ xfce4-mixer/xfce-mixer.c: Implement monitoring for mute,
+ record, volume, option and switch changes on all controls.
+ Works like a charm!
+
2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
* libxfce4mixer/xfce-mixer-card.c: Mark cards as ready when
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c 2008-06-21 22:27:50 UTC
(rev 27118)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c 2008-06-22 01:00:20 UTC
(rev 27119)
@@ -56,6 +56,10 @@
XfceMixerCard *card;
GstMixerTrack *track;
+
+ GtkWidget *combo;
+
+ gboolean ignore_signals;
};
@@ -111,6 +115,7 @@
static void
xfce_mixer_option_init (XfceMixerOption *option)
{
+ option-ignore_signals = FALSE;
}
@@ -161,7 +166,6 @@
xfce_mixer_option_create_contents (XfceMixerOption *option)
{
GstMixerOptions *options;
- GtkWidget *combo;
GtkWidget *label;
const GList *iter;
const gchar *active_option;
@@ -180,20 +184,20 @@
options = GST_MIXER_OPTIONS (option-track);
active_option = xfce_mixer_card_get_track_option (option-card,
option-track);
- combo = gtk_combo_box_new_text ();
+ option-combo = gtk_combo_box_new_text ();
for (iter = options-values, i = 0; iter != NULL; iter = g_list_next (iter),
++i)
{
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo), iter-data);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (option-combo), iter-data);
if (G_UNLIKELY (g_utf8_collate (active_option, iter-data) == 0))
-gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
+gtk_combo_box_set_active (GTK_COMBO_BOX (option-combo), i);
}
- gtk_box_pack_start (GTK_BOX (option), combo, FALSE, FALSE, 0);
- gtk_widget_show (combo);
+ gtk_box_pack_start (GTK_BOX (option), option-combo, FALSE, FALSE, 0);
+ gtk_widget_show (option-combo);
- g_signal_connect (combo, changed, G_CALLBACK (xfce_mixer_option_changed),
option);
+ g_signal_connect (option-combo, changed, G_CALLBACK
(xfce_mixer_option_changed), option);
g_free (title);
}
@@ -206,6 +210,9 @@
{
gchar *active_option;
+ if (G_UNLIKELY (option-ignore_signals))
+return;
+
active_option = gtk_combo_box_get_active_text (combo);
if (G_LIKELY (active_option != NULL))
@@ -214,3 +221,45 @@
g_free (active_option);
}
}
+
+
+
+void
+xfce_mixer_option_update (XfceMixerOption *option)
+{
+ GstMixerOptions *options;
+ GtkTreeModel*model;
+ GtkTreeIter iter;
+ const gchar *active_option;
+ gchar *str;
+ gint i;
+
+ g_return_if_fail (IS_XFCE_MIXER_OPTION (option));
+
+ options = GST_MIXER_OPTIONS (option-track);
+ active_option = xfce_mixer_card_get_track_option (option-card,
option-track);
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (option-combo));
+
+ if (gtk_tree_model_get_iter_first (model, iter))
+{
+ do
+{
+ gtk_tree_model_get (model, iter, 0, str, -1);
+
+ if (G_UNLIKELY (g_utf8_collate (str, active_option) == 0))
+{
+ option-ignore_signals = TRUE;
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (option-combo),
iter);
+ option-ignore_signals = FALSE;
+
+ g_free (str);
+
+ break;
+}
+
+ g_free (str);
+}
+ while (gtk_tree_model_iter_next (model, iter));
+}
+}
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h 2008-06-21
[Xfce4-commits] r27120 - in xfce4-mixer/trunk: panel-plugin po
Author: jannis Date: 2008-06-22 01:34:11 + (Sun, 22 Jun 2008) New Revision: 27120 Added: xfce4-mixer/trunk/po/xfce4-mixer.pot Modified: xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c xfce4-mixer/trunk/po/ChangeLog xfce4-mixer/trunk/po/POTFILES.in xfce4-mixer/trunk/po/am.po xfce4-mixer/trunk/po/da.po xfce4-mixer/trunk/po/de.po xfce4-mixer/trunk/po/fr.po xfce4-mixer/trunk/po/nl.po xfce4-mixer/trunk/po/pt_BR.po xfce4-mixer/trunk/po/pt_PT.po xfce4-mixer/trunk/po/ru.po xfce4-mixer/trunk/po/si.po Log: * de.po: Update German translations. * xfce4-mixer.pot, *.po: Merge strings. Modified: xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c === --- xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-06-22 01:00:20 UTC (rev 27119) +++ xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-06-22 01:34:11 UTC (rev 27120) @@ -224,7 +224,7 @@ gchar *title; gtk_window_set_icon_name (GTK_WINDOW (dialog), xfce4-mixer); - gtk_window_set_title (GTK_WINDOW (dialog), _(Mixer Plugin Settings)); + gtk_window_set_title (GTK_WINDOW (dialog), _(Mixer Plugin)); xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), _(Please select which mixer track should be used by the plugin)); Modified: xfce4-mixer/trunk/po/ChangeLog === --- xfce4-mixer/trunk/po/ChangeLog 2008-06-22 01:00:20 UTC (rev 27119) +++ xfce4-mixer/trunk/po/ChangeLog 2008-06-22 01:34:11 UTC (rev 27120) @@ -1,16 +1,21 @@ -2008-06-21 Stephan Arts [EMAIL PROTECTED] +2008-06-22 Jannis Pohlmann [EMAIL PROTECTED] + * de.po: Update German translations. + * xfce4-mixer.pot, *.po: Merge strings. + +2008-06-21 Stephan Arts [EMAIL PROTECTED] + * nl.po, LINGUAS: Add Dutch translation -2008-05-27 Mike Massonnet [EMAIL PROTECTED] +2008-05-27 Mike Massonnet [EMAIL PROTECTED] * da.po, LINGUAS: Add Danish translation (Ole Guldberg Jensen) -2008-05-05 Og Maciel [EMAIL PROTECTED] +2008-05-05 Og Maciel [EMAIL PROTECTED] * pt_BR.po: Added Brazilian Portuguese translation file. -2008-04-21 Og Maciel [EMAIL PROTECTED] +2008-04-21 Og Maciel [EMAIL PROTECTED] * pt_BR.po: Added Brazilian Portuguese translation. * LINGUAS: Added pt_BR Modified: xfce4-mixer/trunk/po/POTFILES.in === --- xfce4-mixer/trunk/po/POTFILES.in2008-06-22 01:00:20 UTC (rev 27119) +++ xfce4-mixer/trunk/po/POTFILES.in2008-06-22 01:34:11 UTC (rev 27120) @@ -1,3 +1,23 @@ +panel-plugin/xfce-mixer-plugin.c +panel-plugin/xfce-plugin-dialog.c +panel-plugin/xfce-volume-button.c +panel-plugin/xfce-plugin-dialog.h +panel-plugin/xfce-volume-button.h +panel-plugin/xfce4-mixer-plugin.desktop.in.in +libxfce4mixer/xfce-mixer-card.c +libxfce4mixer/xfce-mixer-card-combo.c +libxfce4mixer/xfce-mixer-preferences.c +libxfce4mixer/xfce-mixer-stock.c +libxfce4mixer/xfce-mixer-track-combo.c +libxfce4mixer/xfce-mixer-track-type.c +libxfce4mixer/xfce-mixer-utilities.c +libxfce4mixer/xfce-mixer-card-combo.h +libxfce4mixer/xfce-mixer-card.h +libxfce4mixer/xfce-mixer-preferences.h +libxfce4mixer/xfce-mixer-stock.h +libxfce4mixer/xfce-mixer-track-combo.h +libxfce4mixer/xfce-mixer-track-type.h +libxfce4mixer/xfce-mixer-utilities.h xfce4-mixer/main.c xfce4-mixer/xfce-mixer.c xfce4-mixer/xfce-mixer-controls-dialog.c @@ -5,8 +25,10 @@ xfce4-mixer/xfce-mixer-switch.c xfce4-mixer/xfce-mixer-track.c xfce4-mixer/xfce-mixer-window.c +xfce4-mixer/xfce-mixer-controls-dialog.h +xfce4-mixer/xfce-mixer.h +xfce4-mixer/xfce-mixer-option.h +xfce4-mixer/xfce-mixer-switch.h +xfce4-mixer/xfce-mixer-track.h +xfce4-mixer/xfce-mixer-window.h xfce4-mixer/xfce4-mixer.desktop.in.in -libxfce4mixer/xfce-mixer-card.c -libxfce4mixer/xfce-mixer-preferences.c -libxfce4mixer/xfce-mixer-stock.c -libxfce4mixer/xfce-mixer-track-type.c Modified: xfce4-mixer/trunk/po/am.po === --- xfce4-mixer/trunk/po/am.po 2008-06-22 01:00:20 UTC (rev 27119) +++ xfce4-mixer/trunk/po/am.po 2008-06-22 01:34:11 UTC (rev 27120) @@ -7,7 +7,7 @@ msgstr Project-Id-Version: xfce4-mixer 4.4.2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-06-21 15:45+0200\n +POT-Creation-Date: 2008-06-22 03:25+0200\n PO-Revision-Date: 2007-07-07 10:23+0100\n Last-Translator: tegegne tefera [EMAIL PROTECTED]\n Language-Team: Amharic [EMAIL PROTECTED]\n @@ -15,6 +15,42 @@ Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +#: ../panel-plugin/xfce-mixer-plugin.c:248 +msgid Could not find xfce4-mixer in PATH. +msgstr + +#: ../panel-plugin/xfce-plugin-dialog.c:227 +#, fuzzy +msgid Mixer Plugin +msgstr ሚክሰር ስየማዎች + +#: ../panel-plugin/xfce-plugin-dialog.c:229 +msgid Please select which mixer track should be used by the
[Xfce4-commits] r27121 - in xfce4-mixer/trunk: . xfce4-mixer
Author: jannis
Date: 2008-06-22 01:50:16 + (Sun, 22 Jun 2008)
New Revision: 27121
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
Log:
* xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the
fader of a mixer track with only one channel (which was
caused by accessing the unitialized track-lock_button
variable).
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:34:11 UTC (rev 27120)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121)
@@ -1,5 +1,12 @@
2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+ * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the
+ fader of a mixer track with only one channel (which was
+ caused by accessing the unitialized track-lock_button
+ variable).
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer-track.{c,h},
xfce4-mixer/xfce-mixer-option.{c,h},
xfce4-mixer/xfce-mixer-switch.{c,h},
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:34:11 UTC
(rev 27120)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:50:16 UTC
(rev 27121)
@@ -301,8 +301,8 @@
for (iter = track-channel_faders, channel = 0; iter != NULL; iter =
g_list_next (iter), ++channel)
{
/* If the channels are bound together, apply the volume to all the
others */
- if (G_LIKELY (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(track-lock_button
-gtk_range_set_value (GTK_RANGE (iter-data), gtk_range_get_value
(range));
+ if (G_LIKELY (track-gst_track-num_channels = 2
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (track-lock_button
+ gtk_range_set_value (GTK_RANGE (iter-data), gtk_range_get_value
(range));
volumes[channel] = (gint) gtk_range_get_value (GTK_RANGE (iter-data));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27122 - in xfce4-mixer/trunk: . xfce4-mixer
Author: jannis
Date: 2008-06-22 02:01:36 + (Sun, 22 Jun 2008)
New Revision: 27122
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
they are owned by GStreamer. That introduced a really, really
weird bug ...
* xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all
faders.
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 02:01:36 UTC (rev 27122)
@@ -1,5 +1,13 @@
2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+ * xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
+ they are owned by GStreamer. That introduced a really, really
+ weird bug ...
+ * xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all
+ faders.
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the
fader of a mixer track with only one channel (which was
caused by accessing the unitialized track-lock_button
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:50:16 UTC
(rev 27121)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 02:01:36 UTC
(rev 27122)
@@ -192,6 +192,7 @@
GtkWidget *button_box;
GtkWidget *fader;
const GList *iter;
+ gdouble step;
gint channel;
gint columns;
gint*volumes;
@@ -212,10 +213,12 @@
gtk_table_attach (GTK_TABLE (track), label, 0, columns, 0, 1, GTK_FILL,
GTK_SHRINK, 0, 0);
gtk_widget_show (label);
+ step = (gdouble) (track-gst_track-max_volume -
track-gst_track-min_volume) / (gdouble) 20;
+
/* Create a fader for each channel */
for (channel = 0; channel track-gst_track-num_channels; ++channel)
{
- fader = gtk_vscale_new_with_range (track-gst_track-min_volume,
track-gst_track-max_volume, 1);
+ fader = gtk_vscale_new_with_range (track-gst_track-min_volume,
track-gst_track-max_volume, step);
gtk_scale_set_draw_value (GTK_SCALE (fader), FALSE);
gtk_range_set_inverted (GTK_RANGE (fader), TRUE);
gtk_range_set_value (GTK_RANGE (fader), volumes[channel]);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-22 01:50:16 UTC (rev
27121)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-22 02:01:36 UTC (rev
27122)
@@ -118,7 +118,7 @@
static void
xfce_mixer_init (XfceMixer *mixer)
{
- mixer-widgets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
NULL);
+ mixer-widgets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
