[Xfce4-commits] Improve key comparison.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 3bb8c7d4de8132741da54a26c98459167c51fd87 (commit) from 160d4fe42952284a4bcc48760ae6706ca28fa7e5 (commit) commit 3bb8c7d4de8132741da54a26c98459167c51fd87 Author: Jérôme Guelfucci Date: Tue Dec 18 08:21:03 2012 +0100 Improve key comparison. Remove horrible hardcoded hack and use the recommanded way of comparison described in the GDK documentation instead. libxfce4kbd-private/xfce-shortcuts-grabber.c | 27 - 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c index a94351d..b8d2898 100644 --- a/libxfce4kbd-private/xfce-shortcuts-grabber.c +++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c @@ -432,6 +432,7 @@ struct EventKeyFindContext { XfceShortcutsGrabber *grabber; GdkModifierType modifiers; + GdkModifierType consumed; guint keyval; const gchar *result; }; @@ -443,30 +444,13 @@ find_event_key (const gchar*shortcut, XfceKey*key, struct EventKeyFindContext *context) { - GdkModifierType ignored; - g_return_val_if_fail (context != NULL, FALSE); TRACE ("Comparing to %s", shortcut); - ignored = 0; - - /* Accept MOD1 + META as MOD1 */ - if (key->modifiers & context->modifiers & GDK_MOD1_MASK) -{ - TRACE ("Ignoring Meta Mask"); - ignored |= GDK_META_MASK; -} - - /* Accept SUPER + HYPER as SUPER */ - if (key->modifiers & context->modifiers & GDK_SUPER_MASK) -{ - TRACE ("Ignoring Hyper Mask"); - ignored |= GDK_HYPER_MASK; -} - - if ((key->modifiers & ~ignored) == (context->modifiers & ~ignored) - && key->keyval == context->keyval) + if ((key->modifiers & ~context->consumed & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)) + == (context->modifiers) + && (key->keyval == context->keyval)) { context->result = shortcut; @@ -514,13 +498,12 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, XkbGroupForCoreState (xevent->xkey.state), &keyval, NULL, NULL, &consumed); - /* Get the modifiers */ modifiers &= ~consumed; - gdk_keymap_add_virtual_modifiers (keymap, &modifiers); modifiers &= mod_mask; context.keyval = keyval; context.modifiers = modifiers; + context.consumed = consumed; raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); TRACE ("Looking for %s", raw_shortcut_name); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix indentation.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 160d4fe42952284a4bcc48760ae6706ca28fa7e5 (commit) from bb03d1007f7f14796bbae1d2b6c00cfb38ac57b2 (commit) commit 160d4fe42952284a4bcc48760ae6706ca28fa7e5 Author: Jérôme Guelfucci Date: Tue Dec 18 08:05:21 2012 +0100 Fix indentation. libxfce4kbd-private/xfce-shortcuts-grabber.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c index b8a56e3..a94351d 100644 --- a/libxfce4kbd-private/xfce-shortcuts-grabber.c +++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c @@ -368,7 +368,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, for (j = 0; j < screens; j++) { /* Do the grab on all screens */ - Window root_window; + Window root_window; /* Ignorable modifiers */ guint mod_masks [] = { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Pass event group when translating keyboard state.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to bb03d1007f7f14796bbae1d2b6c00cfb38ac57b2 (commit) from 7a7b32e67f6850c80a793df2daf249bce9ef35a1 (commit) commit bb03d1007f7f14796bbae1d2b6c00cfb38ac57b2 Author: Jérôme Guelfucci Date: Tue Dec 18 08:04:16 2012 +0100 Pass event group when translating keyboard state. libxfce4kbd-private/xfce-shortcut-dialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c index 4c7905a..0519982 100644 --- a/libxfce4kbd-private/xfce-shortcut-dialog.c +++ b/libxfce4kbd-private/xfce-shortcut-dialog.c @@ -367,7 +367,7 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog, modifiers = event->state; gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode, - modifiers, 0, + modifiers, event->group, &keyval, NULL, NULL, &consumed); /* Get the modifiers */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch jeromeg/keyboard-shortcuts
Updating branch refs/heads/jeromeg/keyboard-shortcuts as new branch to 7a7b32e67f6850c80a793df2daf249bce9ef35a1 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/jeromeg/keyboard-shortcuts for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 77%
Updating branch refs/heads/master to adf03abcda820554c779ad063621d725f0b6fa29 (commit) from 7b9f77796007d3912f2cadb1cba96bbe4438bc23 (commit) commit adf03abcda820554c779ad063621d725f0b6fa29 Author: Ivica Kolić Date: Tue Dec 18 01:28:45 2012 +0100 l10n: Updated Croatian (hr) translation to 77% New status: 165 messages complete with 0 fuzzies and 49 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 236 -- 1 files changed, 106 insertions(+), 130 deletions(-) diff --git a/po/hr.po b/po/hr.po index f0cde64..bd74719 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the parole package. # FIRST AUTHOR , YEAR. # Ivica Kolić , 2011. -# +# msgid "" msgstr "" "Project-Id-Version: parole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-13 04:57+\n" +"POT-Creation-Date: 2012-12-17 21:18+\n" "PO-Revision-Date: 2012-12-13 11:03+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Hrvatski <>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Croatian\n" "X-Poedit-SourceCharset: utf-8\n" @@ -34,19 +34,22 @@ msgid "4:3 (TV)" msgstr "4:3 (TV)" #: ../data/interfaces/parole.ui.h:4 -msgid "by Unknown Artist" +msgid "" +"by Unknown " +"Artist" msgstr "" #: ../data/interfaces/parole.ui.h:5 -msgid "on Unknown Album" +msgid "" +"on Unknown " +"Album" msgstr "" #: ../data/interfaces/parole.ui.h:6 msgid "Unknown Song" msgstr "" -#: ../data/interfaces/parole.ui.h:7 -#: ../src/misc/parole-filters.c:64 +#: ../data/interfaces/parole.ui.h:7 ../src/misc/parole-filters.c:64 msgid "Audio" msgstr "Audio" @@ -63,14 +66,12 @@ msgstr "Auto" msgid "Buffering (0%)" msgstr "" -#: ../data/interfaces/parole.ui.h:12 -#: ../src/parole-player.c:707 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708 msgid "Empty" msgstr "Prazno" -#: ../data/interfaces/parole.ui.h:13 -#: ../src/parole-disc.c:111 -#: ../src/parole-disc.c:157 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110 +#: ../src/parole-disc.c:156 msgid "Insert Disc" msgstr "Unesi disk" @@ -94,8 +95,7 @@ msgstr "" msgid "Open _Location" msgstr "Otvori _lokaciju" -#: ../data/interfaces/parole.ui.h:19 -#: ../src/parole-about.c:68 +#: ../data/interfaces/parole.ui.h:19 ../src/parole-about.c:68 msgid "Parole Media Player" msgstr "" @@ -196,27 +196,36 @@ msgid "DVD Name" msgstr "DVD ime" #: ../data/interfaces/playlist.ui.h:7 +msgid "Disc Playlist" +msgstr "Lista izvođenja diska" + +#: ../data/interfaces/playlist.ui.h:8 msgid "Play opened files" msgstr "Izvodi otvorene datoteke" -#: ../data/interfaces/playlist.ui.h:8 +#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785 +#: ../src/parole-player.c:2960 +msgid "Playlist" +msgstr "Lista izvođenja" + +#: ../data/interfaces/playlist.ui.h:10 #: ../data/interfaces/parole-settings.ui.h:17 msgid "Remember playlist" msgstr "Zapamti listu izvođenja" -#: ../data/interfaces/playlist.ui.h:9 +#: ../data/interfaces/playlist.ui.h:11 msgid "Repeat" msgstr "Ponovi" -#: ../data/interfaces/playlist.ui.h:10 +#: ../data/interfaces/playlist.ui.h:12 msgid "Replace playlist when opening files" msgstr "Zamijeni listu izvođenja kada otvorite datoteke" -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:13 msgid "Shuffle" msgstr "" -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:14 msgid "Title Menu" msgstr "Izbornik naslova" @@ -356,8 +365,7 @@ msgstr "Odaberi tip datoteke ( po proširenju)" msgid "Open Network Location" msgstr "" -#: ../data/interfaces/open-location.ui.h:2 -#: ../src/parole-open-location.c:192 +#: ../data/interfaces/open-location.ui.h:2 ../src/parole-open-location.c:192 msgid "Clear History" msgstr "Očisti povijest" @@ -377,8 +385,7 @@ msgstr "Poruka" msgid "Error" msgstr "Greška" -#: ../src/gst/parole-gst.c:1239 -#: ../src/parole-medialist.c:344 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357 #, c-format msgid "Track %i" msgstr "Zapis %i" @@ -408,21 +415,25 @@ msgid "The stream is taking too much time to load" msgstr "" #: ../src/gst/parole-gst.c:2030 -msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation" -msgstr "Nije moguće učitati playbin GStreamer priključak,provjerite vašu GStreamer instalaciju" +msgid "" +"Unable to load playbin GStreamer plugin, check your GStreamer installation" +msgstr "" +"Nije moguće učitati playbin GStreamer priključak,provjerite vašu GStreamer " +"instalaciju" #: ../src/gst/parole-gst.c:2054 -msgid "Unable to load video GStreamer plugin, check your GStreame
[Xfce4-commits] l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to 7b9f77796007d3912f2cadb1cba96bbe4438bc23 (commit) from 82248b022189f00840d9111bc00499a8e49f1d28 (commit) commit 7b9f77796007d3912f2cadb1cba96bbe4438bc23 Author: Rafael Ferreira Date: Mon Dec 17 22:21:19 2012 +0100 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 214 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 95 -- 1 files changed, 52 insertions(+), 43 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a377364..85f91af 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: parole 0.2.0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-07 20:33+\n" +"POT-Creation-Date: 2012-12-17 21:18+\n" "PO-Revision-Date: \n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\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" -"Language: pt_BR\n" #: ../data/interfaces/parole.ui.h:1 msgid "16:9 (Widescreen)" @@ -67,12 +67,12 @@ msgstr "Auto" msgid "Buffering (0%)" msgstr "Carregando em buffer (0%)" -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708 msgid "Empty" msgstr "Vazio" -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 -#: ../src/parole-disc.c:157 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110 +#: ../src/parole-disc.c:156 msgid "Insert Disc" msgstr "Insira disco" @@ -197,27 +197,36 @@ msgid "DVD Name" msgstr "Nome do DVD" #: ../data/interfaces/playlist.ui.h:7 +msgid "Disc Playlist" +msgstr "Lista de reprodução de discos" + +#: ../data/interfaces/playlist.ui.h:8 msgid "Play opened files" msgstr "Reproduzir os arquivos abertos" -#: ../data/interfaces/playlist.ui.h:8 +#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785 +#: ../src/parole-player.c:2960 +msgid "Playlist" +msgstr "Lista de reprodução" + +#: ../data/interfaces/playlist.ui.h:10 #: ../data/interfaces/parole-settings.ui.h:17 msgid "Remember playlist" msgstr "Lembrar lista de reprodução" -#: ../data/interfaces/playlist.ui.h:9 +#: ../data/interfaces/playlist.ui.h:11 msgid "Repeat" msgstr "Repetir" -#: ../data/interfaces/playlist.ui.h:10 +#: ../data/interfaces/playlist.ui.h:12 msgid "Replace playlist when opening files" msgstr "Substituir a lista de reprodução quando abrir arquivos" -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:13 msgid "Shuffle" msgstr "Embaralhar" -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:14 msgid "Title Menu" msgstr "Título do menu" @@ -377,7 +386,7 @@ msgstr "Mensagem" msgid "Error" msgstr "Erro" -#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357 #, c-format msgid "Track %i" msgstr "Faixa %i" @@ -536,32 +545,32 @@ msgstr "O Parole já está em execução. Use -i para abrir uma nova instância\ msgid "Supported files" msgstr "Arquivos suportados" -#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:920 +#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:921 msgid "All files" msgstr "Todos arquivos" -#: ../src/parole-medialist.c:360 +#: ../src/parole-medialist.c:373 #, c-format msgid "Chapter %i" msgstr "Capítulo %i" -#: ../src/parole-medialist.c:630 +#: ../src/parole-medialist.c:643 msgid "Permission denied" msgstr "Permissão negada" -#: ../src/parole-medialist.c:632 +#: ../src/parole-medialist.c:645 msgid "Error saving playlist file" msgstr "Erro ao salvar a lista de reprodução" -#: ../src/parole-medialist.c:644 +#: ../src/parole-medialist.c:657 msgid "Unknown playlist format" msgstr "Formato de lista de reprodução desconhecido" -#: ../src/parole-medialist.c:645 +#: ../src/parole-medialist.c:658 msgid "Please chooser a supported playlist format" msgstr "Por favor, use um formato de lista de reprodução suportado" -#: ../src/parole-medialist.c:697 ../src/parole-plugins-manager.c:349 +#: ../src/parole-medialist.c:710 ../src/parole-plugins-manager.c:349 #: ../src/plugins/properties/stream-properties-provider.c:140 #: ../src/plugins/properties/stream-properties-provider.c:141 #: ../src/plugins/properties/stream-properties-provider.c:142 @@ -569,35 +578,35 @@ msgstr "Por favor, use um formato de lista de reprodução suportado" msgid "Unknown" msgstr "Desconhecido" -#: ../src/parole-medialist.c:772 ../src/parole-player.c:2973 -msgid "Playlist" -msgstr "Lista de reprodução" - -#: ../src/parole-medialist.c:779 +#: ../src/parole-medialist.c:792 msgid "M3U Playlists" msgstr "Listas de reprodução M3U" -#: ../src/parole-medialist
[Xfce4-commits] Use new pspecs list instead of loading from the object.
Updating branch refs/heads/master to f150f8d8fa0e4d26c5ea1733b7985742da2d3144 (commit) from edcf864a9c16ec51c08b96b661a346ccb52827e5 (commit) commit f150f8d8fa0e4d26c5ea1733b7985742da2d3144 Author: Nick Schermer Date: Mon Dec 17 20:03:03 2012 +0100 Use new pspecs list instead of loading from the object. terminal/terminal-preferences.c | 11 --- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c index ab06850..c14a881 100644 --- a/terminal/terminal-preferences.c +++ b/terminal/terminal-preferences.c @@ -1387,12 +1387,11 @@ terminal_preferences_load (TerminalPreferences *preferences) { gchar*filename; const gchar *string, *name; - GParamSpec **pspecs, *pspec; + GParamSpec *pspec; XfceRc *rc; GValuedst = { 0, }; GValuesrc = { 0, }; GValue *value; - guint nspecs; guint n; filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, "Terminal/terminalrc"); @@ -1411,10 +1410,9 @@ terminal_preferences_load (TerminalPreferences *preferences) g_value_init (&src, G_TYPE_STRING); - pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (preferences), &nspecs); - for (n = 0; n < nspecs; ++n) + for (n = PROP_0 + 1; n < N_PROPERTIES; ++n) { - pspec = pspecs[n]; + pspec = preferences_props[n]; name = g_param_spec_get_name (pspec); #ifndef NDEBUG @@ -1425,7 +1423,7 @@ terminal_preferences_load (TerminalPreferences *preferences) if (G_UNLIKELY (string == NULL)) { /* check if we need to reset to the default value */ - value = preferences->values + (n + 1); + value = preferences->values + n; if (G_IS_VALUE (value)) { g_value_unset (value); @@ -1452,7 +1450,6 @@ terminal_preferences_load (TerminalPreferences *preferences) } } } - g_free (pspecs); g_value_unset (&src); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use standard stock icons.
Updating branch refs/heads/master to eb2cc6adbcccbb607de409abf5c915200217bc54 (commit) from 73d40638921a30e70b46fc4653bc643e0a65485c (commit) commit eb2cc6adbcccbb607de409abf5c915200217bc54 Author: Nick Schermer Date: Mon Dec 17 18:35:52 2012 +0100 Use standard stock icons. Except for the bug report icon, all other icons are part of most of the themes, so drop those and use the common icon names. Makefile.am|1 - Terminal-default-apps.xml.in.in|2 +- configure.ac.in|5 - icons/16x16/Makefile.am| 11 - icons/16x16/stock_terminal-closetab.png| Bin 665 -> 0 bytes icons/16x16/stock_terminal-closewindow.png | Bin 686 -> 0 bytes icons/16x16/stock_terminal-newtab.png | Bin 611 -> 0 bytes icons/16x16/stock_terminal-newwindow.png | Bin 694 -> 0 bytes icons/16x16/stock_terminal-reportbug.png | Bin 775 -> 0 bytes icons/24x24/Makefile.am| 13 -- icons/24x24/stock_terminal-closetab.png| Bin 935 -> 0 bytes icons/24x24/stock_terminal-newtab.png | Bin 859 -> 0 bytes icons/24x24/stock_terminal-newwindow.png | Bin 1036 -> 0 bytes icons/24x24/stock_terminal-reportbug.png | Bin 1222 -> 0 bytes icons/24x24/stock_terminal-showborders.png | Bin 745 -> 0 bytes icons/24x24/stock_terminal-showmenu.png| Bin 402 -> 0 bytes icons/48x48/Makefile.am| 12 -- icons/48x48/Terminal.png | Bin 1209 -> 0 bytes icons/48x48/stock_terminal-compose.png | Bin 3278 -> 0 bytes icons/Makefile.am | 27 --- icons/scalable/Makefile.am |8 - icons/scalable/Terminal.svg| 298 icons/terminal.xpm | 93 - terminal/Makefile.am |2 - terminal/main.c|7 +- terminal/terminal-preferences-dialog.c |1 - terminal/terminal-shortcut-editor.c|3 +- terminal/terminal-stock.c | 121 --- terminal/terminal-stock.h | 38 terminal/terminal-window.c | 15 +- 30 files changed, 10 insertions(+), 647 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9f6240a..cd6a7b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = \ doc \ - icons \ po \ terminal diff --git a/Terminal-default-apps.xml.in.in b/Terminal-default-apps.xml.in.in index 7fb4386..6306b8d 100644 --- a/Terminal-default-apps.xml.in.in +++ b/Terminal-default-apps.xml.in.in @@ -6,7 +6,7 @@ <_name>Xfce Terminal Emulator @PACKAGE_EXEC@ @PACKAGE_EXEC@ - Terminal + utilities-terminal -x diff --git a/configure.ac.in b/configure.ac.in index 6ad89a3..5e7ebc9 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -178,11 +178,6 @@ AC_OUTPUT([ Makefile doc/Makefile doc/po/Makefile -icons/Makefile -icons/16x16/Makefile -icons/24x24/Makefile -icons/48x48/Makefile -icons/scalable/Makefile po/Makefile.in terminal/Makefile terminal/terminal-config.h diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am deleted file mode 100644 index 5351c54..000 --- a/icons/16x16/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/16x16/stock/navigation -icons_DATA = \ - stock_terminal-closetab.png \ - stock_terminal-newtab.png \ - stock_terminal-newwindow.png\ - stock_terminal-reportbug.png - -EXTRA_DIST = \ - $(icons_DATA) - -# vi:set ts=8 sw=8 noet ai nocindent: diff --git a/icons/16x16/stock_terminal-closetab.png b/icons/16x16/stock_terminal-closetab.png deleted file mode 100644 index a7d2263..000 Binary files a/icons/16x16/stock_terminal-closetab.png and /dev/null differ diff --git a/icons/16x16/stock_terminal-closewindow.png b/icons/16x16/stock_terminal-closewindow.png deleted file mode 100644 index 4f887cf..000 Binary files a/icons/16x16/stock_terminal-closewindow.png and /dev/null differ diff --git a/icons/16x16/stock_terminal-newtab.png b/icons/16x16/stock_terminal-newtab.png deleted file mode 100644 index 935e49d..000 Binary files a/icons/16x16/stock_terminal-newtab.png and /dev/null differ diff --git a/icons/16x16/stock_terminal-newwindow.png b/icons/16x16/stock_terminal-newwindow.png deleted file mode 100644 index 8a83687..000 Binary files a/icons/16x16/stock_terminal-newwindow.png and /dev/null differ diff --git a/icons/16x16/stock_terminal-reportbug.png b/icons/16x16/stock_terminal-reportbug.png deleted file mode 100644 index b12d4cb..000 Binary files a/icons/16x16/stock_terminal
[Xfce4-commits] Fix setting primary output and correctly setting all others secondary
Updating branch refs/heads/ochosi/primary to 36fe0952354c7a7da8bc037d4a92fb6bac6a9a03 (commit) from a42364389f5f6399376cbfa2a4cf750b731ba062 (commit) commit 36fe0952354c7a7da8bc037d4a92fb6bac6a9a03 Author: Simon Steinbeiss Date: Mon Dec 17 17:21:11 2012 +0100 Fix setting primary output and correctly setting all others secondary dialogs/display-settings/main.c | 53 +- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 7ed4761..3c619fe 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1218,27 +1218,64 @@ display_setting_primary_toggled (GtkToggleButton *togglebutton, if (gtk_toggle_button_get_active (togglebutton)) { -/* Set currently active display as primary and all others as secondary */ +/* Set currently active display as primary */ xfce_randr->status[active_output]=XFCE_OUTPUT_STATUS_PRIMARY; +xfce_randr_save_output (xfce_randr, "Default", display_channel, +active_output, FALSE); +/* and all others as secondary */ for (m = 0; m < xfce_randr->noutput; ++m) { if (m != active_output) { xfce_randr->status[m]=XFCE_OUTPUT_STATUS_SECONDARY; +xfce_randr_save_output (xfce_randr, "Default", display_channel, +m, FALSE); } } + } else +{ xfce_randr->status[active_output]=XFCE_OUTPUT_STATUS_SECONDARY; +xfce_randr_save_output (xfce_randr, "Default", display_channel, +active_output, FALSE); +} /* Apply the changes */ -xfce_randr_save_output (xfce_randr, "Default", display_channel, -active_output, FALSE); xfce_randr_apply (xfce_randr, "Default", display_channel); } static void +display_setting_primary_populate (GtkBuilder *builder) +{ +GObject *check; + +if (!xfce_randr) +return; + +check = gtk_builder_get_object (builder, "primary"); + +if (xfce_randr->noutput > 1) +gtk_widget_show (GTK_WIDGET (check)); +else +{ +gtk_widget_hide (GTK_WIDGET (check)); +return; +} + +/* Block the "changed" signal to avoid triggering the confirmation dialog */ +g_signal_handlers_block_by_func (check, display_setting_primary_toggled, + builder); +gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), + xfce_randr->status[active_output] != XFCE_OUTPUT_STATUS_SECONDARY); +/* Unblock the signal */ +g_signal_handlers_unblock_by_func (check, display_setting_primary_toggled, + builder); +} + + +static void display_setting_output_toggled (GtkToggleButton *togglebutton, GtkBuilder *builder) { @@ -1346,6 +1383,7 @@ display_settings_treeview_selection_changed (GtkTreeSelection *selection, display_setting_positions_populate (builder); display_setting_active_displays_populate (builder); display_setting_output_status_populate (builder); +display_setting_primary_populate (builder); display_setting_mirror_displays_populate (builder); display_setting_resolutions_populate (builder); display_setting_refresh_rates_populate (builder); @@ -1479,7 +1517,7 @@ display_settings_dialog_new (GtkBuilder *builder) GtkCellRenderer *renderer; GtkTreeSelection *selection; GObject *combobox; -GObject *label, *check, *mirror; +GObject *label, *check, *mirror, *primary; /* Get the treeview */ treeview = gtk_builder_get_object (builder, "randr-outputs"); @@ -1506,17 +1544,21 @@ display_settings_dialog_new (GtkBuilder *builder) /* Setup the combo boxes */ check = gtk_builder_get_object (builder, "output-on"); mirror = gtk_builder_get_object (builder, "mirror-displays"); +primary = gtk_builder_get_object (builder, "primary"); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (display_setting_output_toggled), builder); g_signal_connect (G_OBJECT (mirror), "toggled", G_CALLBACK (display_setting_mirror_displays_toggled), builder); +g_signal_connect (G_OBJECT (primary), "toggled", G_CALLBACK (display_setting_primary_toggled), builder); if (xfce_randr->noutput > 1) { gtk_widget_show (GTK_WIDGET (check)); gtk_widget_show (GTK_WIDGET (mirror)); +gtk_widget_show (GTK_WIDGET (primary)); } else { gtk_widget_hide (GTK_WIDGET (check)); gtk_widget_hide (GTK_WIDGET (mirror)); +gtk_widget_hide (GTK_WIDGET (primary)); } label = gtk_builder_get_object (builder, "label-reflection"); @@ -1547,9 +1589,6 @@ display_setti
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to fefc65487306e210ce49d65b1089d456473a9f8a (commit) from e07b4569d3259812c5d48b4d3378c84a73af3cad (commit) commit fefc65487306e210ce49d65b1089d456473a9f8a Author: Pjotr vertaalt Date: Mon Dec 17 15:07:26 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 737 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 442 +++--- 1 files changed, 221 insertions(+), 221 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7e2632c..4e19a79 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the thunar package. # Vincent Tunru , 2006-2007. # Pjotr, 2011. -# +# msgid "" msgstr "" "Project-Id-Version: thunar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-05 19:56+0100\n" +"POT-Creation-Date: 2012-12-17 11:06+\n" "PO-Revision-Date: 2011-09-08 15:47+0100\n" "Last-Translator: Pjotr\n" "Language-Team: Dutch (Flemish)\n" -"Language: nl (Dutch)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl (Dutch)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar/main.c:62 @@ -135,10 +135,10 @@ msgstr "Kon actie niet uitvoeren" #. tell the user that we were unable to launch the file specified #: ../thunar/thunar-application.c:1113 ../thunar/thunar-application.c:1239 -#: ../thunar/thunar-launcher.c:1208 ../thunar/thunar-location-entry.c:402 +#: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 -#: ../thunar/thunar-shortcuts-view.c:1614 -#: ../thunar/thunar-shortcuts-view.c:1642 ../thunar/thunar-window.c:2171 +#: ../thunar/thunar-shortcuts-view.c:1630 +#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2219 #, c-format msgid "Failed to open \"%s\"" msgstr "Kon '%s' niet openen" @@ -151,20 +151,20 @@ msgstr "Kon '%s' niet openen: %s" #. display an error message #: ../thunar/thunar-application.c:1307 #: ../thunar/thunar-properties-dialog.c:671 -#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1753 +#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1760 #, c-format msgid "Failed to rename \"%s\"" msgstr "Hernoemen van '%s' mislukt" #: ../thunar/thunar-application.c:1409 #: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1615 +#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1622 msgid "New Folder" msgstr "Nieuwe map" #: ../thunar/thunar-application.c:1410 #: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1616 +#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1623 msgid "Create New Folder" msgstr "Nieuwe map maken" @@ -252,8 +252,8 @@ msgstr "Alle bestanden en mappen uit de prullenbak verwijderen?" #. append the "Empty Trash" menu action #. prepare the menu item #: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171 -#: ../thunar/thunar-shortcuts-view.c:1174 ../thunar/thunar-tree-view.c:1176 -#: ../thunar/thunar-window.c:339 ../plugins/thunar-tpa/thunar-tpa.c:189 +#: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183 +#: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid "_Empty Trash" msgstr "Prullenbak _legen" @@ -306,7 +306,7 @@ msgstr "Geen toepassing geselecteerd" msgid "Other Application..." msgstr "Andere toepassing..." -#: ../thunar/thunar-chooser-dialog.c:188 ../thunar/thunar-launcher.c:180 +#: ../thunar/thunar-chooser-dialog.c:188 ../thunar/thunar-launcher.c:181 msgid "Open With" msgstr "Openen met" @@ -702,9 +702,8 @@ msgstr "ReplaceDialogPart1|Wilt u de bestaande map vervangen" msgid "ReplaceDialogPart1|Do you want to replace the existing file" msgstr "ReplaceDialogPart1|Wilt u het bestaande bestand vervangen" -#. #. Fourth box (size, volume, free space) -#. +#. #: ../thunar/thunar-dialogs.c:618 ../thunar/thunar-dialogs.c:649 #: ../thunar/thunar-properties-dialog.c:456 msgid "Size:" @@ -758,7 +757,7 @@ msgstr "Hiernaar een koppe_ling maken" #. display an error to the user #. display an error message to the user -#: ../thunar/thunar-dnd.c:254 ../thunar/thunar-launcher.c:566 +#: ../thunar/thunar-dnd.c:254 ../thunar/thunar-launcher.c:567 #, c-format msgid "Failed to execute file \"%s\"" msgstr "Kon bestand '%s' niet uitvoeren" @@ -802,9 +801,8 @@ msgstr "Naam" msgid "Owner" msgstr "Eigenaar" -#. #. Permissions chooser -#. +#. #: ../thunar/thunar-enum-types.c:98 ../thunar/thunar-properties-dialog.c:528 msgid "Permissions" msgstr "Rechten" @@ -825,44 +823,44 @@ msgstr "Bestand" msgid "File Name" msgstr "Bestandnaam" -
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 82248b022189f00840d9111bc00499a8e49f1d28 (commit) from 9a8c3479f38ad1864322f4bdbd3a68d0053078be (commit) commit 82248b022189f00840d9111bc00499a8e49f1d28 Author: Pjotr vertaalt Date: Mon Dec 17 15:06:57 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 214 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 101 +++--- 1 files changed, 57 insertions(+), 44 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7a7521b..7669e4f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: parole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-10 07:24+\n" +"POT-Creation-Date: 2012-12-17 10:36+\n" "PO-Revision-Date: 2012-07-025 11:55+0200\n" "Last-Translator: Pjotr\n" "Language-Team: Dutch (Flemish)\n" @@ -37,13 +37,17 @@ msgstr "4:3 (TV)" msgid "" "by Unknown " "Artist" -msgstr "by Onbekende artiest" +msgstr "" +"by Onbekende " +"artiest" #: ../data/interfaces/parole.ui.h:5 msgid "" "on Unknown " "Album" -msgstr "on Onbekend album" +msgstr "" +"on Onbekend " +"album" #: ../data/interfaces/parole.ui.h:6 msgid "Unknown Song" @@ -66,12 +70,12 @@ msgstr "Automatisch" msgid "Buffering (0%)" msgstr "Aan het bufferen (0%)" -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708 msgid "Empty" msgstr "Leeg" -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 -#: ../src/parole-disc.c:157 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110 +#: ../src/parole-disc.c:156 msgid "Insert Disc" msgstr "Stop schijf erin" @@ -200,27 +204,36 @@ msgid "DVD Name" msgstr "DVD-naam" #: ../data/interfaces/playlist.ui.h:7 +msgid "Disc Playlist" +msgstr "Speellijst van schijf" + +#: ../data/interfaces/playlist.ui.h:8 msgid "Play opened files" msgstr "Geopende bestanden afspelen" -#: ../data/interfaces/playlist.ui.h:8 +#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785 +#: ../src/parole-player.c:2960 +msgid "Playlist" +msgstr "Speellijst" + +#: ../data/interfaces/playlist.ui.h:10 #: ../data/interfaces/parole-settings.ui.h:17 msgid "Remember playlist" msgstr "Speellijst onthouden" -#: ../data/interfaces/playlist.ui.h:9 +#: ../data/interfaces/playlist.ui.h:11 msgid "Repeat" msgstr "Herhaal" -#: ../data/interfaces/playlist.ui.h:10 +#: ../data/interfaces/playlist.ui.h:12 msgid "Replace playlist when opening files" msgstr "Speellijst vervangen bij openen van bestanden" -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:13 msgid "Shuffle" msgstr "Schuffelen" -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:14 msgid "Title Menu" msgstr "Titelmenu" @@ -380,7 +393,7 @@ msgstr "Boodschap" msgid "Error" msgstr "Fout" -#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357 #, c-format msgid "Track %i" msgstr "Geluidsspoor %i" @@ -540,32 +553,32 @@ msgstr "Parole is al actief, gebruik -i om een nieuwe instantie te openen\n" msgid "Supported files" msgstr "Ondersteunde bestanden" -#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:920 +#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:921 msgid "All files" msgstr "Alle bestanden" -#: ../src/parole-medialist.c:360 +#: ../src/parole-medialist.c:373 #, c-format msgid "Chapter %i" msgstr "Hoofdstuk %i" -#: ../src/parole-medialist.c:630 +#: ../src/parole-medialist.c:643 msgid "Permission denied" msgstr "Toestemming geweigerd" -#: ../src/parole-medialist.c:632 +#: ../src/parole-medialist.c:645 msgid "Error saving playlist file" msgstr "Opslaan van de speellijst is mislukt" -#: ../src/parole-medialist.c:644 +#: ../src/parole-medialist.c:657 msgid "Unknown playlist format" msgstr "Onbekende opmaak van speellijst" -#: ../src/parole-medialist.c:645 +#: ../src/parole-medialist.c:658 msgid "Please chooser a supported playlist format" msgstr "Kies a.u.b. een ondersteunde speellijst-opmaak" -#: ../src/parole-medialist.c:697 ../src/parole-plugins-manager.c:349 +#: ../src/parole-medialist.c:710 ../src/parole-plugins-manager.c:349 #: ../src/plugins/properties/stream-properties-provider.c:140 #: ../src/plugins/properties/stream-properties-provider.c:141 #: ../src/plugins/properties/stream-properties-provider.c:142 @@ -573,35 +586,35 @@ msgstr "Kies a.u.b. een ondersteunde speellijst-opmaak" msgid "Unknown" msgstr "Onbekend" -#: ../src/parole-medialist.c:772 ../src/parole-player.c:2973 -msgid "Playlist" -msgstr "Speellijst" - -#: ../src/parole-medialist.c:779 +#: ../src/parole-medialist.c:792 msgid "M3U Playlists" msgstr "M3U-speellijsten" -#: ../src/parole-medialist.c:787 +#: ../src/paro
[Xfce4-commits] l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 988bbf431264722af852900094d0f82d8b582040 (commit) from 510851a96d3cecf25775d365b38130f221101d87 (commit) commit 988bbf431264722af852900094d0f82d8b582040 Author: Yarema aka Knedlyk Date: Mon Dec 17 14:14:58 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/uk.po b/po/uk.po index 09b85cf..19b8d8e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -167,12 +167,12 @@ msgstr "Розділ змонтований" #: ../thunar-volman/tvm-block-device.c:635 #, c-format msgid "The volume \"%s\" was mounted automatically" -msgstr "Том \"%s\" автоматично змонтований" +msgstr "Розділ \"%s\" автоматично змонтований" #: ../thunar-volman/tvm-block-device.c:640 #, c-format msgid "The inserted volume was mounted automatically" -msgstr "Вставлений том був автоматично змонтований" +msgstr "Вставлений пристрій був автоматично змонтований" #: ../thunar-volman/tvm-block-device.c:694 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 510851a96d3cecf25775d365b38130f221101d87 (commit) from 3dca45e645822555e6ac80435ea29d0f46bdcc1a (commit) commit 510851a96d3cecf25775d365b38130f221101d87 Author: Yarema aka Knedlyk Date: Mon Dec 17 14:13:29 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/uk.po b/po/uk.po index c9efdcd..09b85cf 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: thunar-volman 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-10 08:06+\n" +"POT-Creation-Date: 2012-12-17 11:18+\n" "PO-Revision-Date: 2007-11-10 20:23+0200\n" "Last-Translator: Dmitry Nikitin \n" "Language-Team: Ukrainian \n" @@ -35,7 +35,7 @@ msgstr "Показати інформацію про версію і вийти" #. setup application name #: ../thunar-volman/main.c:93 msgid "Thunar Volume Manager" -msgstr "Thunar Керівник Томів" +msgstr "Менеджер Розділів для Thunar" #: ../thunar-volman/main.c:121 msgid "All rights reserved." @@ -162,7 +162,7 @@ msgstr "DVD автоматично змонтоване" #: ../thunar-volman/tvm-block-device.c:632 msgid "Volume mounted" -msgstr "Том змонтований" +msgstr "Розділ змонтований" #: ../thunar-volman/tvm-block-device.c:635 #, c-format @@ -321,7 +321,7 @@ msgstr "Тип пристрою USB \"%s\" не підтримується " #. setup application name #: ../thunar-volman-settings/main.c:52 msgid "Thunar Volume Manager Settings" -msgstr "Thunar Менеджер Пристроїв" +msgstr "Налаштування Менеджера Розділів для Thunar" #: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits