[Xfce4-commits] [apps/xfce4-terminal] branch master updated (ccd7e80 -> b8ee36a)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/xfce4-terminal. from ccd7e80 Resolve window manager warning new b8ee36a I18n: Update translation kk (85%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/kk.po | 819 +-- 1 file changed, 488 insertions(+), 331 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-terminal] 01/01: I18n: Update translation kk (85%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/xfce4-terminal. commit b8ee36afe7f0ab6937eb4875f94896a2a66c2051 Author: Baurzhan MuftakhidinovDate: Tue Oct 25 18:30:58 2016 +0200 I18n: Update translation kk (85%). 274 translated messages, 47 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/kk.po | 819 +-- 1 file changed, 488 insertions(+), 331 deletions(-) diff --git a/po/kk.po b/po/kk.po index 0ae0de3..ba8cacc 100644 --- a/po/kk.po +++ b/po/kk.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Baurzhan Muftakhidinov , 2009,2013-2014 +# Baurzhan Muftakhidinov , 2009,2013-2014,2016 msgid "" msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-27 00:31+0100\n" -"PO-Revision-Date: 2014-01-06 11:40+\n" +"POT-Creation-Date: 2016-10-14 18:30+0200\n" +"PO-Revision-Date: 2016-10-25 12:38+\n" "Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfce/language/kk/)\n" +"Language-Team: Kazakh (http://www.transifex.com/xfce/xfce-apps/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -64,7 +64,7 @@ msgstr "Жалпы опциялар" #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:111 ../terminal/main.c:137 +#: ../terminal/main.c:111 ../terminal/main.c:138 msgid "display" msgstr "дисплей" @@ -92,137 +92,171 @@ msgstr "команда" msgid "title" msgstr "атауы" -#: ../terminal/main.c:135 +#: ../terminal/main.c:136 msgid "Window Options" msgstr "Терезе опциялары" #. parameter of --geometry -#: ../terminal/main.c:139 +#: ../terminal/main.c:140 msgid "geometry" msgstr "өлшемдері" #. parameter of --role -#: ../terminal/main.c:141 +#: ../terminal/main.c:142 msgid "role" msgstr "ролі" #. parameter of --startup-id -#: ../terminal/main.c:143 +#: ../terminal/main.c:144 msgid "string" msgstr "жол" #. parameter of --icon -#: ../terminal/main.c:145 +#: ../terminal/main.c:146 msgid "icon" msgstr "таңбаша" -#: ../terminal/main.c:147 +#. parameter of --font +#: ../terminal/main.c:148 +msgid "font" +msgstr "қаріп" + +#. parameter of --zoom +#: ../terminal/main.c:150 +msgid "zoom" +msgstr "масштаб" + +#: ../terminal/main.c:152 #, c-format msgid "See the %s man page for full explanation of the options above." msgstr "Төмендегі опциялардың толық анықтамасы үшін %s man парағын оқыңыз." -#: ../terminal/main.c:180 ../xfce4-terminal.desktop.in.h:1 +#: ../terminal/main.c:185 ../xfce4-terminal.desktop.in.h:1 msgid "Xfce Terminal" msgstr "Xfce Terminal" -#: ../terminal/main.c:196 +#: ../terminal/main.c:201 msgid "The Xfce development team. All rights reserved." msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." -#: ../terminal/main.c:197 -msgid "Written by Benedikt Meurer " -msgstr "Жасаған: Benedikt Meurer " +#: ../terminal/main.c:202 +msgid "Written by Benedikt Meurer ," +msgstr "" -#: ../terminal/main.c:198 -msgid "and Nick Schermer ." -msgstr "және Nick Schermer ." +#: ../terminal/main.c:203 +msgid "Nick Schermer " +msgstr "" -#: ../terminal/main.c:199 +#: ../terminal/main.c:204 +msgid "and Igor Zakharov ." +msgstr "" + +#: ../terminal/main.c:205 #, c-format msgid "Please report bugs to <%s>." msgstr "Ақаулықтар жөнінде хабарлаңыз: <%s>." -#: ../terminal/main.c:304 +#: ../terminal/main.c:312 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "Терминал қызметін тіркеу мүмкін емес: %s\n" -#: ../terminal/terminal-app.c:738 +#: ../terminal/terminal-app.c:856 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "Қате geometry жолы \"%s\"\n" -#: ../terminal/terminal-encoding-action.c:70 +#: ../terminal/terminal-encoding-action.c:68 msgid "Western European" msgstr "Батыс Еуропалық" -#: ../terminal/terminal-encoding-action.c:71 +#: ../terminal/terminal-encoding-action.c:69 msgid "Central European" msgstr "Орталық Еуропалық" -#: ../terminal/terminal-encoding-action.c:72 +#: ../terminal/terminal-encoding-action.c:70 msgid "Baltic" msgstr "Балтық" -#: ../terminal/terminal-encoding-action.c:73 +#: ../terminal/terminal-encoding-action.c:71 msgid "South-Eastern Europe" msgstr "Оңтүстік-Шығыс Еуропалық" -#: ../terminal/terminal-encoding-action.c:74 +#: ../terminal/terminal-encoding-action.c:72 msgid "Turkish" msgstr "Түрік" -#: ../terminal/terminal-encoding-action.c:75 +#: ../terminal/terminal-encoding-action.c:73 msgid "Cyrillic" msgstr "Кириллица" -#:
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/02: I18n: Update translation nl (100%).
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit 9a91d76e351297190abb2f6f12eac53806459e09 Author: Graeme GottDate: Tue Oct 25 08:42:20 2016 -0400 I18n: Update translation nl (100%). --- po/nl.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index c2bad18..344aa83 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Whisker Menu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-23 12:12+\n" -"PO-Revision-Date: 2016-08-14 18:33+\n" +"POT-Creation-Date: 2016-10-23 12:14+\n" +"PO-Revision-Date: 2016-10-24 11:11+\n" "Last-Translator: Pjotr \n" "Language-Team: Dutch (http://www.transifex.com/gottcode/xfce4-whiskermenu-; "plugin/language/nl/)\n" @@ -41,7 +41,7 @@ msgstr "Alle" #: ../panel-plugin/settings.cpp:119 msgid "All _Settings" -msgstr "Alle instellingen" +msgstr "Alle _instellingen" #: ../panel-plugin/plugin.cpp:411 msgid "Alternate application launcher for Xfce" @@ -49,7 +49,7 @@ msgstr "Alternatieve toepassingenstarter voor Xfce" #: ../panel-plugin/configuration-dialog.cpp:717 msgid "Amount of _items:" -msgstr "Hoeveelheid elementen:" +msgstr "Hoeveelheid _elementen:" #: ../panel-plugin/plugin.cpp:243 msgid "Applications" @@ -65,7 +65,7 @@ msgstr "Blader door het bestandssysteem om een aangepaste opdracht te kiezen." #: ../panel-plugin/configuration-dialog.cpp:874 msgid "C_ommand:" -msgstr "Opdracht:" +msgstr "_Opdracht:" #: ../panel-plugin/configuration-dialog.cpp:637 msgid "Categ_ory icon size:" @@ -85,7 +85,7 @@ msgstr "Bijzonderheden" #: ../panel-plugin/configuration-dialog.cpp:533 msgid "Di_splay:" -msgstr "Tonen:" +msgstr "_Tonen:" #: ../panel-plugin/configuration-dialog.cpp:734 msgid "Display by _default" @@ -93,7 +93,7 @@ msgstr "Standaard tonen" #: ../panel-plugin/settings.cpp:124 msgid "Edit _Profile" -msgstr "Profiel bewerken" +msgstr "_Profiel bewerken" #: ../panel-plugin/settings.cpp:124 msgid "Failed to edit profile." @@ -168,7 +168,7 @@ msgstr "Menu" #: ../panel-plugin/configuration-dialog.cpp:849 msgid "Nam_e:" -msgstr "Naam:" +msgstr "_Naam:" #: ../panel-plugin/configuration-dialog.cpp:794 msgid "Name" @@ -221,7 +221,7 @@ msgstr "Actie '%s' verwijderen?" #: ../panel-plugin/configuration-dialog.cpp:825 msgid "Remove selected action" -msgstr "Gekozen actie verwijderen" +msgstr "Verwijder gekozen actie" #: ../panel-plugin/run-action.cpp:71 #, c-format @@ -262,7 +262,7 @@ msgstr "Toon gereedschapstips voor toepassingen" #: ../panel-plugin/configuration-dialog.cpp:597 msgid "Show cate_gory names" -msgstr "" +msgstr "Toon namen van categorieën" #: ../panel-plugin/configuration-dialog.cpp:591 msgid "Show generic application _names" @@ -353,7 +353,7 @@ msgstr "_Gedrag" #: ../panel-plugin/command-edit.cpp:67 #: ../panel-plugin/configuration-dialog.cpp:121 msgid "_Cancel" -msgstr "_Annuleren" +msgstr "_Afbreken" #: ../panel-plugin/configuration-dialog.cpp:74 msgid "_Close" @@ -361,7 +361,7 @@ msgstr "_Sluiten" #: ../panel-plugin/configuration-dialog.cpp:85 msgid "_Commands" -msgstr "_Opdrachten" +msgstr "Op_drachten" #: ../panel-plugin/configuration-dialog.cpp:430 msgid "_Delete" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 01/02: I18n: Update translation lt (100%).
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit 2b39ebdbdb24599d3521579792fb06951c08444d Author: Graeme GottDate: Tue Oct 25 08:41:19 2016 -0400 I18n: Update translation lt (100%). --- po/lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index f73e8f0..9e8e156 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Whisker Menu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-23 12:12+\n" -"PO-Revision-Date: 2016-09-13 19:53+\n" +"POT-Creation-Date: 2016-10-23 12:14+\n" +"PO-Revision-Date: 2016-10-23 18:55+\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/gottcode/xfce4-; "whiskermenu-plugin/language/lt/)\n" @@ -263,7 +263,7 @@ msgstr "Rodyti programų paaiškinimus" #: ../panel-plugin/configuration-dialog.cpp:597 msgid "Show cate_gory names" -msgstr "" +msgstr "Rodyti kate_gorijų pavadinimus" #: ../panel-plugin/configuration-dialog.cpp:591 msgid "Show generic application _names" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 01/02: Replace gtk_menu_popup().
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit 65f616022646c6fdbad80ce78d6beb4e44d90b72 Author: Graeme GottDate: Tue Oct 25 08:20:20 2016 -0400 Replace gtk_menu_popup(). --- panel-plugin/page.cpp | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/panel-plugin/page.cpp b/panel-plugin/page.cpp index 063f934..276db3e 100644 --- a/panel-plugin/page.cpp +++ b/panel-plugin/page.cpp @@ -197,7 +197,6 @@ gboolean Page::view_popup_menu_event(GtkWidget* view) void Page::create_context_menu(GtkTreeIter* iter, GdkEvent* event) { - GdkEventButton* event_button = reinterpret_cast (event); m_selected_path = gtk_tree_model_get_path(m_view->get_model(), iter); Launcher* launcher = get_selected_launcher(); if (!launcher) @@ -268,11 +267,17 @@ G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_show_all(menu); // Show context menu + gtk_tree_view_set_hover_selection(GTK_TREE_VIEW(m_view->get_widget()), false); + gtk_menu_attach_to_widget(GTK_MENU(menu), m_view->get_widget(), NULL); +#if GTK_CHECK_VERSION(3,22,0) + gtk_menu_popup_at_pointer(GTK_MENU(menu), event); +#else int button = 0; int event_time; GtkMenuPositionFunc position_func = NULL; if (event) { + GdkEventButton* event_button = reinterpret_cast (event); button = event_button->button; event_time = event_button->time; } @@ -282,9 +287,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS event_time = gtk_get_current_event_time (); } - gtk_tree_view_set_hover_selection(GTK_TREE_VIEW(m_view->get_widget()), false); - gtk_menu_attach_to_widget(GTK_MENU(menu), m_view->get_widget(), NULL); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, position_func, this, button, event_time); +#endif } //- -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] branch master updated (cb95442 -> 85b7c58)
This is an automated email from the git hooks/post-receive script. gottcode pushed a change to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. from cb95442 Add support for desktop actions. (bug #11787) new 65f6160 Replace gtk_menu_popup(). new 85b7c58 Replace deprecated code. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: panel-plugin/page.cpp | 10 +++--- panel-plugin/window.cpp | 5 + 2 files changed, 12 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/02: Replace deprecated code.
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit 85b7c58f9382421dd4d1b2e24b10156168a9be35 Author: Graeme GottDate: Tue Oct 25 08:26:19 2016 -0400 Replace deprecated code. --- panel-plugin/window.cpp | 5 + 1 file changed, 5 insertions(+) diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp index 8224722..d7f8bb1 100644 --- a/panel-plugin/window.cpp +++ b/panel-plugin/window.cpp @@ -413,8 +413,13 @@ void WhiskerMenu::Window::show(GtkWidget* parent, bool horizontal) // Fetch screen geomtry GdkRectangle monitor; +#if GTK_CHECK_VERSION(3,22,0) + GdkMonitor* monitor_gdk = gdk_display_get_monitor_at_point(gdk_display_get_default(), parent_x, parent_y); + gdk_monitor_get_geometry(monitor_gdk, ); +#else int monitor_num = gdk_screen_get_monitor_at_point(screen, parent_x, parent_y); gdk_screen_get_monitor_geometry(screen, monitor_num, ); +#endif // Prevent window from being larger than screen if (m_geometry.width > monitor.width) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (6e62288 -> ccd7e80)
This is an automated email from the git hooks/post-receive script. f2404 pushed a change to branch master in repository apps/xfce4-terminal. from 6e62288 I18n: Update translation zh_CN (100%). new ccd7e80 Resolve window manager warning The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: terminal/terminal-util.c | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-terminal] 01/01: Resolve window manager warning
This is an automated email from the git hooks/post-receive script. f2404 pushed a commit to branch master in repository apps/xfce4-terminal. commit ccd7e80a4613edc9948bd7ba43ee10e8ac06e506 Author: IgorDate: Tue Oct 25 15:26:02 2016 +0300 Resolve window manager warning Buggy client sent a _NET_ACTIVE_WINDOW message with a timestamp of 0 --- terminal/terminal-util.c | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/terminal/terminal-util.c b/terminal/terminal-util.c index f851ee9..1e3ff37 100644 --- a/terminal/terminal-util.c +++ b/terminal/terminal-util.c @@ -98,27 +98,34 @@ void terminal_util_activate_window (GtkWindow *window) { #ifdef GDK_WINDOWING_X11 + guint32 timestamp; XClientMessageEvent event; + GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); terminal_return_if_fail (GTK_IS_WINDOW (window)); terminal_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); - if (!GDK_IS_X11_WINDOW (gtk_widget_get_window (GTK_WIDGET (window + if (!GDK_IS_X11_WINDOW (gdk_window)) return; /* leave if the window is already active */ if (gtk_window_is_active (window)) return; + timestamp = gtk_get_current_event_time (); + if (timestamp == 0) +timestamp = gdk_x11_get_server_time (gdk_window); + /* we need a slightly custom version of the call through Gtk+ to * properly focus the panel when a plugin calls * xfce_panel_plugin_focus_widget() */ event.type = ClientMessage; - event.window = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))); + event.window = GDK_WINDOW_XID (gdk_window); event.message_type = gdk_x11_get_xatom_by_name ("_NET_ACTIVE_WINDOW"); event.format = 32; event.data.l[0] = 1; /* app */ - event.data.l[1] = event.data.l[2] = event.data.l[3] = event.data.l[4] = 0; + event.data.l[1] = timestamp; + event.data.l[2] = event.data.l[3] = event.data.l[4] = 0; gdk_error_trap_push (); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 01/02: Replace duplicated code.
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit bda7f7c4becd53ab043d88412923f4c2d73ef32e Author: Graeme GottDate: Sun Oct 23 18:22:22 2016 -0400 Replace duplicated code. --- panel-plugin/launcher.cpp | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/panel-plugin/launcher.cpp b/panel-plugin/launcher.cpp index 6bffd6a..fcc2d50 100644 --- a/panel-plugin/launcher.cpp +++ b/panel-plugin/launcher.cpp @@ -219,22 +219,18 @@ void Launcher::run(GdkScreen* screen) const { case 'i': replace_with_quoted_string(command, i, "--icon ", garcon_menu_item_get_icon_name(m_item)); - length = command.length() - 1; break; case 'c': replace_with_quoted_string(command, i, garcon_menu_item_get_name(m_item)); - length = command.length() - 1; break; case 'k': replace_and_free_with_quoted_string(command, i, garcon_menu_item_get_uri(m_item)); - length = command.length() - 1; break; case '%': command.erase(i, 1); - length = command.length() - 1; break; case 'f': @@ -247,9 +243,9 @@ void Launcher::run(GdkScreen* screen) const // unsupported, pass in a list of URLs dropped on launcher default: command.erase(i, 2); - length = command.length() - 1; break; } + length = command.length() - 1; } } -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] branch master updated (0937210 -> cb95442)
This is an automated email from the git hooks/post-receive script. gottcode pushed a change to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. from 0937210 Update strings. new bda7f7c Replace duplicated code. new cb95442 Add support for desktop actions. (bug #11787) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: panel-plugin/launcher.cpp | 97 --- panel-plugin/launcher.h | 60 - panel-plugin/page.cpp | 42 panel-plugin/page.h | 2 + panel-plugin/slot.h | 41 +++- 5 files changed, 235 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/02: Add support for desktop actions. (bug #11787)
This is an automated email from the git hooks/post-receive script. gottcode pushed a commit to branch master in repository panel-plugins/xfce4-whiskermenu-plugin. commit cb95442b745b8f8b9d2928a49601ed1d99b5f19f Author: Graeme GottDate: Sun Oct 23 19:41:51 2016 -0400 Add support for desktop actions. (bug #11787) --- panel-plugin/launcher.cpp | 91 +++ panel-plugin/launcher.h | 60 ++- panel-plugin/page.cpp | 42 ++ panel-plugin/page.h | 2 ++ panel-plugin/slot.h | 41 - 5 files changed, 234 insertions(+), 2 deletions(-) diff --git a/panel-plugin/launcher.cpp b/panel-plugin/launcher.cpp index fcc2d50..7c3396e 100644 --- a/panel-plugin/launcher.cpp +++ b/panel-plugin/launcher.cpp @@ -185,12 +185,30 @@ Launcher::Launcher(GarconMenuItem* item) : { m_search_command = normalize(command); } + + // Fetch desktop actions +#ifdef GARCON_TYPE_MENU_ITEM_ACTION + GList* actions = garcon_menu_item_get_actions(m_item); + for (GList* i = actions; i != NULL; i = i->next) + { + GarconMenuItemAction* action = garcon_menu_item_get_action(m_item, reinterpret_cast (i->data)); + if (action) + { + m_actions.push_back(new DesktopAction(action)); + } + } + g_list_free(actions); +#endif } //- Launcher::~Launcher() { + for (std::vector ::size_type i = 0, end = m_actions.size(); i < end; ++i) + { + delete m_actions[i]; + } } //- @@ -274,6 +292,79 @@ void Launcher::run(GdkScreen* screen) const //- +void Launcher::run(GdkScreen* screen, DesktopAction* action) const +{ + const gchar* string = action->get_command(); + if (exo_str_is_empty(string)) + { + return; + } + std::string command(string); + + // Expand the field codes + size_t length = command.length() - 1; + for (size_t i = 0; i < length; ++i) + { + if (G_UNLIKELY(command[i] == '%')) + { + switch (command[i + 1]) + { + case 'i': + replace_with_quoted_string(command, i, "--icon ", action->get_icon()); + break; + + case 'c': + replace_with_quoted_string(command, i, action->get_name()); + break; + + case 'k': + replace_and_free_with_quoted_string(command, i, garcon_menu_item_get_uri(m_item)); + + case '%': + command.erase(i, 1); + break; + + case 'f': + // unsupported, pass in a single file dropped on launcher + case 'F': + // unsupported, pass in a list of files dropped on launcher + case 'u': + // unsupported, pass in a single URL dropped on launcher + case 'U': + // unsupported, pass in a list of URLs dropped on launcher + default: + command.erase(i, 2); + break; + } + length = command.length() - 1; + } + } + + // Parse and spawn command + gchar** argv; + gboolean result = false; + GError* error = NULL; + if (g_shell_parse_argv(command.c_str(), NULL, , )) + { + result = xfce_spawn_on_screen(screen, + garcon_menu_item_get_path(m_item), + argv, NULL, G_SPAWN_SEARCH_PATH, + garcon_menu_item_supports_startup_notification(m_item), + gtk_get_current_event_time(), + action->get_icon(), + ); + g_strfreev(argv); + } + + if (G_UNLIKELY(!result)) + { + xfce_dialog_show_error(NULL, error, _("Failed to execute command \"%s\"."), string); + g_error_free(error); + } +} + +//- + guint Launcher::search(const Query& query) { // Prioritize matches in favorites and recent, then favories, and then recent diff --git a/panel-plugin/launcher.h
[Xfce4-commits] [apps/xfce4-notifyd] branch master updated (d5ebc93 -> 1f2c17c)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/xfce4-notifyd. from d5ebc93 I18n: Update translation hr (100%). new 1f2c17c I18n: Update translation zh_CN (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/zh_CN.po | 74 - 1 file changed, 49 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (e8ccf98 -> 6e62288)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/xfce4-terminal. from e8ccf98 I18n: Update translation zh_CN (99%). new 6e62288 I18n: Update translation zh_CN (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/zh_CN.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-terminal] 01/01: I18n: Update translation zh_CN (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/xfce4-terminal. commit 6e62288feff250f412bfa7c2c21edc8023de86b6 Author: 玉堂白鹤Date: Tue Oct 25 12:31:11 2016 +0200 I18n: Update translation zh_CN (100%). 321 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/zh_CN.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c118a0c..c56c843 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-14 18:30+0200\n" -"PO-Revision-Date: 2016-10-25 03:53+\n" +"PO-Revision-Date: 2016-10-25 07:49+\n" "Last-Translator: 玉堂白鹤 \n" "Language-Team: Chinese (China) (http://www.transifex.com/xfce/xfce-apps/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -443,7 +443,7 @@ msgstr "Xfce 终端模拟器" #: ../terminal/terminal-util.c:88 msgid "translator-credits" -msgstr "Hunt Xu , 2009.\nChipong Luo , 2011, 2012.\nxiaohao , 2012.\n玉堂白鹤 ,2013." +msgstr "Hunt Xu , 2009.\nChipong Luo , 2011, 2012.\nxiaohao , 2012.\n玉堂白鹤 ,2016." #: ../terminal/terminal-util.c:91 msgid "Visit Terminal website" @@ -1030,7 +1030,7 @@ msgstr "透明度(_O):" msgid "" "Sorry, your Window Manager does not support compositing:\n" "Opacity setting is not available." -msgstr "" +msgstr "对不起,您的窗口管理器不支持合成:\n不透明度设置不可用。" #: ../terminal/terminal-preferences.glade.h:59 msgid "Appearance and Animation" @@ -1088,7 +1088,7 @@ msgstr "选择背景图片文件" #: ../terminal/terminal-preferences.glade.h:72 msgid "_Shading:" -msgstr "" +msgstr "底纹(_S):" #: ../terminal/terminal-preferences.glade.h:73 msgid "Background" @@ -1392,7 +1392,7 @@ msgstr "自动隐藏鼠标指针(_D)" #: ../terminal/terminal-preferences.glade.h:148 msgid "Re_wrap terminal contents on resize" -msgstr "" +msgstr "调整大小时重新调整终端内容(_W)" #: ../terminal/terminal-preferences.glade.h:149 msgid "Misc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-notifyd] 01/01: I18n: Update translation zh_CN (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/xfce4-notifyd. commit 1f2c17cfd63362107af3790e7fe0ef11f2dd262c Author: 玉堂白鹤Date: Tue Oct 25 12:30:56 2016 +0200 I18n: Update translation zh_CN (100%). 32 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/zh_CN.po | 74 - 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 368557f..1b14d25 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,13 +7,14 @@ # Hunt Xu , 2009-2010 # Mingcong Bai , 2016 # 玉堂白鹤 , 2014 +# 玉堂白鹤 , 2016 msgid "" msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-30 00:31+0200\n" -"PO-Revision-Date: 2016-08-07 07:55+\n" -"Last-Translator: Mingcong Bai \n" +"POT-Creation-Date: 2016-10-04 00:30+0200\n" +"PO-Revision-Date: 2016-10-25 08:27+\n" +"Last-Translator: 玉堂白鹤 \n" "Language-Team: Chinese (China) (http://www.transifex.com/xfce/xfce-apps/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../xfce4-notifyd/main.c:53 ../xfce4-notifyd/main.c:63 -#: ../xfce4-notifyd-config/main.c:257 +#: ../xfce4-notifyd-config/main.c:468 msgid "Xfce Notify Daemon" msgstr "Xfce 提示守护进程" @@ -35,54 +36,54 @@ msgstr "未知选项 “%s”\n" msgid "Unable to start notification daemon" msgstr "未能启动通知守护进程" -#: ../xfce4-notifyd/xfce-notify-daemon.c:353 +#: ../xfce4-notifyd/xfce-notify-daemon.c:363 #, c-format msgid "Another notification daemon is running, exiting\n" msgstr "另一个通知守护程序已在运行,现将退出\n" -#: ../xfce4-notifyd-config/main.c:56 +#: ../xfce4-notifyd-config/main.c:59 msgid "Notification Preview" msgstr "通知预览" -#: ../xfce4-notifyd-config/main.c:57 +#: ../xfce4-notifyd-config/main.c:60 msgid "This is what notifications will look like" msgstr "通知看起来会像这个样子" -#: ../xfce4-notifyd-config/main.c:62 +#: ../xfce4-notifyd-config/main.c:65 msgid "Button" msgstr "按钮" -#: ../xfce4-notifyd-config/main.c:69 +#: ../xfce4-notifyd-config/main.c:72 msgid "Notification preview failed" msgstr "无法预览通知" -#: ../xfce4-notifyd-config/main.c:259 +#: ../xfce4-notifyd-config/main.c:470 msgid "Settings daemon is unavailable" msgstr "设置守护进程无效" -#: ../xfce4-notifyd-config/main.c:309 +#: ../xfce4-notifyd-config/main.c:559 msgid "Display version information" msgstr "显示版本信息" -#: ../xfce4-notifyd-config/main.c:310 +#: ../xfce4-notifyd-config/main.c:560 msgid "Settings manager socket" msgstr "设置管理器套接字" -#: ../xfce4-notifyd-config/main.c:310 +#: ../xfce4-notifyd-config/main.c:560 msgid "SOCKET_ID" msgstr "套接字 ID(_I)" -#: ../xfce4-notifyd-config/main.c:320 +#: ../xfce4-notifyd-config/main.c:570 #, c-format msgid "Type '%s --help' for usage." msgstr "输入 ‘%s --help’ 获取用法。" -#: ../xfce4-notifyd-config/main.c:333 +#: ../xfce4-notifyd-config/main.c:585 #, c-format msgid "Released under the terms of the GNU General Public License, version 2\n" msgstr "以 GNU 通用公共许可协议第二版发布\n" -#: ../xfce4-notifyd-config/main.c:334 +#: ../xfce4-notifyd-config/main.c:586 #, c-format msgid "Please report bugs to %s.\n" msgstr "请向 %s 报告缺陷。\n" @@ -109,29 +110,52 @@ msgid "Notifications" msgstr "通知" #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 -msgid "_Preview" -msgstr "预览(_P)" +#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 +msgid "Customize how notifications appear on your screen" +msgstr "自定义通知在您屏幕上的显示方式" #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 +msgid "Show Notification _Preview" +msgstr "显示通知预览(_P)" + +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid "_Theme:" msgstr "主题(_T):" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 msgid "Default _position:" msgstr "默认位置(_P):" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 msgid "seconds" msgstr "秒" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:11 msgid "_Disappear after:" msgstr "此时间后消失(_D):" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:11 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:12 msgid "_Opacity:" msgstr "透明度(_O):" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 -msgid "Customize how notifications appear on your screen" -msgstr "自定义通知在您屏幕上的显示方式" +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:13 +msgid "Appearance" +msgstr "外观" + +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:14 +msgid "Do not disturb" +msgstr "请勿打扰" + +#: