diff --git a/docs/reference/XAppFavorites.html b/docs/reference/XAppFavorites.html index cf8ab1a..24c3a89 100644 --- a/docs/reference/XAppFavorites.html +++ b/docs/reference/XAppFavorites.html @@ -207,6 +207,8 @@

The XAppFavorites class allows applications display frequently-used files and provide a safe mechanism for launching them.

A list of XAppFavoriteInfos can be retrieved in full, or only for specific mimetypes.

+

A favorites uri scheme is also available if the xapp gtk3 module is loaded and this also makes the +uri available as a shortcut in file dialogs.

XAppFavorites are new for 2.0

diff --git a/docs/reference/XAppStatusIcon.html b/docs/reference/XAppStatusIcon.html index c8c74ca..d00f862 100644 --- a/docs/reference/XAppStatusIcon.html +++ b/docs/reference/XAppStatusIcon.html @@ -916,7 +916,7 @@ additional icons are created, only the name given to the initial one will be used for dbus, though different names can still affect the sort order. This is set to the value of -g_get_application_name() if no other name is provided.

+g_get_prgname() if no other name is provided.

Owner: XAppStatusIcon

Flags: Read / Write / Construct

Default value: NULL

diff --git a/docs/reference/api-index-full.html b/docs/reference/api-index-full.html index 2352a52..53d1efa 100644 --- a/docs/reference/api-index-full.html +++ b/docs/reference/api-index-full.html @@ -13,7 +13,9 @@ - - + + - + + + + + + + + + +
@@ -65,6 +83,45 @@

Since: 1.8

+
+
+

xapp_util_get_session_is_running ()

+
gboolean
+xapp_util_get_session_is_running (void);
+

Check if the Session Manager is currently in the "Running" phase.

+
+

Returns

+

TRUE if the session is running.

+
+

Since: 2.0

+
+
+
+

xapp_pango_font_string_to_css ()

+
gchar *
+xapp_pango_font_string_to_css (const char *pango_font_string);
+

Converts a pango font description string to a string suitable for use with the css "font" tag. The font description must contain the font family and font size or conversion will fail and NULL will be returned

+
+

Parameters

+
+++++ + + + + + +

pango_font_string

a pango font description string

 
+
+
+

Returns

+

(transfer full) the css compatible font string or NULL if the conversion failed.

+
+

Since: 2.2

+
diff --git a/docs/reference/libxapp.devhelp2 b/docs/reference/libxapp.devhelp2 index 96f9a51..4540263 100644 --- a/docs/reference/libxapp.devhelp2 +++ b/docs/reference/libxapp.devhelp2 @@ -229,6 +229,8 @@ + + diff --git a/docs/reference/object-tree.html b/docs/reference/object-tree.html index 5b5889d..b2b6074 100644 --- a/docs/reference/object-tree.html +++ b/docs/reference/object-tree.html @@ -49,7 +49,8 @@ │ ╰── XAppStatusIconInterfaceProxy ├── GDBusInterfaceSkeleton │ ╰── XAppStatusIconInterfaceSkeleton - ╰── XAppStatusIconMonitor + ├── XAppStatusIconMonitor + ╰── XAppStyleManager GInterface ├── XAppObject ╰── XAppStatusIconInterface diff --git a/libxapp/favorite-vfs-file-enumerator.c b/libxapp/favorite-vfs-file-enumerator.c index 220f9f5..6f39527 100644 --- a/libxapp/favorite-vfs-file-enumerator.c +++ b/libxapp/favorite-vfs-file-enumerator.c @@ -1,6 +1,9 @@ #include "xapp-favorites.h" #include "favorite-vfs-file-enumerator.h" #include "favorite-vfs-file.h" + +#define DEBUG_FLAG XAPP_DEBUG_FAVORITE_VFS +#include "xapp-debug.h" typedef struct { diff --git a/libxapp/favorite-vfs-file-monitor.c b/libxapp/favorite-vfs-file-monitor.c index 10d9b74..9433270 100644 --- a/libxapp/favorite-vfs-file-monitor.c +++ b/libxapp/favorite-vfs-file-monitor.c @@ -1,6 +1,9 @@ #include "xapp-favorites.h" #include "favorite-vfs-file.h" #include "favorite-vfs-file-monitor.h" + +#define DEBUG_FLAG XAPP_DEBUG_FAVORITE_VFS +#include "xapp-debug.h" typedef struct { @@ -54,7 +57,7 @@ // FavoriteVfsFileMonitor *monitor = FAVORITE_VFS_FILE_MONITOR (user_data); // FavoriteVfsFileMonitorPrivate *priv = favorite_vfs_file_monitor_get_instance_private (monitor); -// g_debug ("real file changed: %s: %d", g_file_get_uri (file), event_type); +// DEBUG ("real file changed: %s: %d", g_file_get_uri (file), event_type); // switch (event_type) // { @@ -63,7 +66,7 @@ // { // gchar *uri = g_file_get_uri (file); -// g_debug ("Deleted: %s\n", uri); +// DEBUG ("Deleted: %s\n", uri); // xapp_favorites_remove (xapp_favorites_get_default (), uri); // g_free (uri); @@ -75,7 +78,7 @@ // { // gchar *uri = g_file_get_uri (file); -// g_debug ("Renamed: %s\n", uri); +// DEBUG ("Renamed: %s\n", uri); // rename_favorite (file, other_file); // } @@ -99,7 +102,7 @@ // uri = path_to_fav_uri (info->display_name); // fav_file = g_file_new_for_uri (uri); -// g_debug ("Changed: %s", uri); +// DEBUG ("Changed: %s", uri); // g_free (uri); // g_file_monitor_emit_event (G_FILE_MONITOR (monitor), @@ -167,7 +170,7 @@ GFile *real_file; GError *error; - g_debug ("Monitoring real file: %s\n", info->uri); + DEBUG ("Monitoring real file: %s\n", info->uri); error = NULL; real_file = g_file_new_for_uri (info->uri); diff --git a/libxapp/favorite-vfs-file.c b/libxapp/favorite-vfs-file.c index ba7eb69..d313990 100644 --- a/libxapp/favorite-vfs-file.c +++ b/libxapp/favorite-vfs-file.c @@ -4,6 +4,9 @@ #include "favorite-vfs-file.h" #include "favorite-vfs-file-enumerator.h" #include "favorite-vfs-file-monitor.h" + +#define DEBUG_FLAG XAPP_DEBUG_FAVORITE_VFS +#include "xapp-debug.h" #define FAVORITES_SCHEMA "org.x.apps.favorites" #define FAVORITE_DCONF_METADATA_KEY "root-metadata" @@ -1380,7 +1383,7 @@ new_file = g_object_new (FAVORITE_TYPE_VFS_FILE, NULL); - g_debug ("FavoriteVfsFile new for uri: %s", uri); + DEBUG ("FavoriteVfsFile new for uri: %s", uri); FavoriteVfsFilePrivate *priv = favorite_vfs_file_get_instance_private (FAVORITE_VFS_FILE (new_file)); diff --git a/libxapp/meson.build b/libxapp/meson.build index 888d447..7fa7d3d 100644 --- a/libxapp/meson.build +++ b/libxapp/meson.build @@ -18,6 +18,11 @@ 'favorite-vfs-file-monitor.c' ] +xapp_debug = [ + 'xapp-debug.h', + 'xapp-debug.c' +] + xapp_headers = [ 'xapp-favorites.h', 'xapp-gtk-window.h', @@ -28,6 +33,7 @@ 'xapp-stack-sidebar.h', 'xapp-status-icon.h', 'xapp-status-icon-monitor.h', + 'xapp-style-manager.h', 'xapp-util.h' ] @@ -42,6 +48,7 @@ 'xapp-stack-sidebar.c', 'xapp-status-icon.c', 'xapp-status-icon-monitor.c', + 'xapp-style-manager.c', 'xapp-util.c' ] @@ -95,7 +102,7 @@ ) libxapp = library('xapp', - sources : xapp_headers + xapp_sources + xapp_enums + dbus_headers + favorite_vfs_sources, + sources : xapp_headers + xapp_sources + xapp_enums + dbus_headers + favorite_vfs_sources + xapp_debug, include_directories: [top_inc], version: meson.project_version(), soversion: '1', diff --git a/libxapp/xapp-debug.c b/libxapp/xapp-debug.c new file mode 100644 index 0000000..feb1122 --- /dev/null +++ b/libxapp/xapp-debug.c @@ -0,0 +1,95 @@ +/* + * xapp-debug: debug loggers for xapp + * + * Copyright (C) 2007 Collabora Ltd. + * Copyright (C) 2007 Nokia Corporation + * Copyright (C) 2010 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Copied from nemo + */ + +#include + +#include + +#include "xapp-debug.h" + +static DebugFlags flags = 0; +static gboolean initialized = FALSE; + +static GDebugKey keys[] = { + { "GtkWindow", XAPP_DEBUG_WINDOW }, + { "Favorites", XAPP_DEBUG_FAVORITES }, + { "FavoriteVfs", XAPP_DEBUG_FAVORITE_VFS }, + { "StatusIcon", XAPP_DEBUG_STATUS_ICON }, + { "SnWatcher", XAPP_DEBUG_SN_WATCHER }, + { "GtkModule", XAPP_DEBUG_MODULE}, + { 0, } +}; + +static void +xapp_debug_set_flags_from_env (void) +{ + guint nkeys; + const gchar *flags_string; + + for (nkeys = 0; keys[nkeys].value; nkeys++); + + flags_string = g_getenv ("XAPP_DEBUG"); + + if (flags_string) + xapp_debug_set_flags (g_parse_debug_string (flags_string, keys, nkeys)); + + initialized = TRUE; +} + +void +xapp_debug_set_flags (DebugFlags new_flags) +{ + flags |= new_flags; + initialized = TRUE; +} + +gboolean +xapp_debug_flag_is_set (DebugFlags flag) +{ + return flag & flags; +} + +void +xapp_debug (DebugFlags flag, + const gchar *format, + ...) +{ + va_list args; + va_start (args, format); + xapp_debug_valist (flag, format, args); + va_end (args); +} + +void +xapp_debug_valist (DebugFlags flag, + const gchar *format, + va_list args) +{ + if (G_UNLIKELY(!initialized)) + xapp_debug_set_flags_from_env (); + + if (flag & flags) + g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args); +} + diff --git a/libxapp/xapp-debug.h b/libxapp/xapp-debug.h new file mode 100644 index 0000000..bd1e5de --- /dev/null +++ b/libxapp/xapp-debug.h @@ -0,0 +1,75 @@ +/* + * xapp-debug: debug loggers for xapp + * + * Copyright (C) 2007 Collabora Ltd. + * Copyright (C) 2007 Nokia Corporation + * Copyright (C) 2010 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Copied from nemo + */ + +#ifndef __XAPP_DEBUG_H__ +#define __XAPP_DEBUG_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef enum +{ + XAPP_DEBUG_WINDOW = 1 << 1, + XAPP_DEBUG_FAVORITES = 1 << 2, + XAPP_DEBUG_FAVORITE_VFS = 1 << 3, + XAPP_DEBUG_STATUS_ICON = 1 << 4, + XAPP_DEBUG_SN_WATCHER = 1 << 5, + XAPP_DEBUG_MODULE = 1 << 6 +} DebugFlags; + +void xapp_debug_set_flags (DebugFlags flags); +gboolean xapp_debug_flag_is_set (DebugFlags flag); + +void xapp_debug_valist (DebugFlags flag, + const gchar *format, va_list args); + +void xapp_debug (DebugFlags flag, const gchar *format, ...) + G_GNUC_PRINTF (2, 3); + +#ifdef DEBUG_FLAG + +#define DEBUG(format, ...) \ + xapp_debug (DEBUG_FLAG, "%s: %s: " format, G_STRFUNC, G_STRLOC, \ + ##__VA_ARGS__) + +#define DEBUGGING xapp_debug_flag_is_set(DEBUG_FLAG) + +#endif /* DEBUG_FLAG */ + +#else /* ENABLE_DEBUG */ + +#ifdef DEBUG_FLAG + +#define DEBUG(format, ...) \ + G_STMT_START { } G_STMT_END + +#define DEBUGGING 0 + +#endif /* DEBUG_FLAG */ + +G_END_DECLS + +#endif /* __XAPP_DEBUG_H__ */ diff --git a/libxapp/xapp-favorites.c b/libxapp/xapp-favorites.c index 6c4b8a1..867747f 100644 --- a/libxapp/xapp-favorites.c +++ b/libxapp/xapp-favorites.c @@ -19,6 +19,9 @@ #include "xapp-favorites.h" #include "favorite-vfs-file.h" +#define DEBUG_FLAG XAPP_DEBUG_FAVORITES +#include "xapp-debug.h" + #define FAVORITES_SCHEMA "org.x.apps.favorites" #define FAVORITES_KEY "list" #define SETTINGS_DELIMITER "::" @@ -56,7 +59,7 @@ XAppFavoriteInfo * xapp_favorite_info_copy (const XAppFavoriteInfo *info) { - // g_debug ("XAppFavoriteInfo: copy"); + // DEBUG ("XAppFavoriteInfo: copy"); g_return_val_if_fail (info != NULL, NULL); XAppFavoriteInfo *_info = g_slice_dup (XAppFavoriteInfo, info); @@ -78,7 +81,7 @@ void xapp_favorite_info_free (XAppFavoriteInfo *info) { - g_debug ("XAppFavoriteInfo free (%s)", info->uri); + DEBUG ("XAppFavoriteInfo free (%s)", info->uri); g_return_if_fail (info != NULL); g_free (info->uri); @@ -125,7 +128,7 @@ XAppFavorites *favorites = XAPP_FAVORITES (data); XAppFavoritesPrivate *priv = xapp_favorites_get_instance_private (favorites); - g_debug ("XAppFavorites: list updated, emitting changed signal"); + DEBUG ("XAppFavorites: list updated, emitting changed signal"); priv->changed_timer_id = 0; g_signal_emit (favorites, signals[CHANGED], 0); @@ -204,7 +207,7 @@ GFileInfo *info; GFile *file; - g_debug ("Sync metadata: %s - Favorite? %d", uri, is_favorite); + DEBUG ("Sync metadata: %s - Favorite? %d", uri, is_favorite); info = g_file_info_new (); @@ -264,7 +267,7 @@ g_settings_set_strv (priv->settings, FAVORITES_KEY, (const gchar* const*) new_settings); g_signal_handler_unblock (priv->settings, priv->settings_listener_id); - g_debug ("XAppFavorites: store_favorites: favorites saved"); + DEBUG ("XAppFavorites: store_favorites: favorites saved"); g_strfreev (new_settings); } @@ -307,7 +310,7 @@ g_strfreev (raw_list); - g_debug ("XAppFavorites: load_favorite: favorites loaded (%d)", i); + DEBUG ("XAppFavorites: load_favorite: favorites loaded (%d)", i); if (signal_changed) { @@ -404,7 +407,7 @@ g_return_if_fail (real_uri != NULL); - g_debug ("XAppFavorites: remove favorite: %s", real_uri); + DEBUG ("XAppFavorites: remove favorite: %s", real_uri); // It may be orphaned for some reason.. even if it's not in gsettings, still try // to remove the favorite attribute. @@ -412,7 +415,7 @@ if (!g_hash_table_remove (priv->infos, real_uri)) { - g_debug ("XAppFavorites: remove_favorite: could not find favorite for uri '%s'", real_uri); + DEBUG ("XAppFavorites: remove_favorite: could not find favorite for uri '%s'", real_uri); g_free (real_uri); return; } @@ -596,7 +599,7 @@ // Check if it's there again, in case it was added while we were getting mimetype. if (g_hash_table_contains (priv->infos, uri)) { - g_debug ("XAppFavorites: favorite for '%s' exists, ignoring", uri); + DEBUG ("XAppFavorites: favorite for '%s' exists, ignoring", uri); return; } @@ -611,7 +614,7 @@ g_hash_table_insert (priv->infos, (gpointer) g_strdup (uri), (gpointer) info); - g_debug ("XAppFavorites: added favorite: %s", uri); + DEBUG ("XAppFavorites: added favorite: %s", uri); deduplicate_display_names (favorites, priv->infos); @@ -644,7 +647,7 @@ if (error) { - g_debug ("XAppFavorites: problem trying to figure out content type for uri '%s': %s", + DEBUG ("XAppFavorites: problem trying to figure out content type for uri '%s': %s", uri, error->message); g_error_free (error); } @@ -681,7 +684,7 @@ if (g_hash_table_contains (priv->infos, uri)) { - g_debug ("XAppFavorites: favorite for '%s' exists, ignoring", uri); + DEBUG ("XAppFavorites: favorite for '%s' exists, ignoring", uri); return; } @@ -711,7 +714,7 @@ { XAppFavoritesPrivate *priv = xapp_favorites_get_instance_private (favorites); - g_debug ("XAppFavorites: init:"); + DEBUG ("XAppFavorites: init:"); priv->settings = g_settings_new (FAVORITES_SCHEMA); priv->settings_listener_id = g_signal_connect (priv->settings, @@ -728,7 +731,7 @@ XAppFavorites *favorites = XAPP_FAVORITES (object); XAppFavoritesPrivate *priv = xapp_favorites_get_instance_private (favorites); - g_debug ("XAppFavorites dispose (%p)", object); + DEBUG ("XAppFavorites dispose (%p)", object); g_clear_object (&priv->settings); g_clear_pointer (&priv->infos, g_hash_table_destroy); @@ -739,7 +742,7 @@ static void xapp_favorites_finalize (GObject *object) { - g_debug ("XAppFavorites finalize (%p)", object); + DEBUG ("XAppFavorites finalize (%p)", object); G_OBJECT_CLASS (xapp_favorites_parent_class)->finalize (object); } @@ -849,7 +852,7 @@ ret = g_list_reverse (data.items); gchar *typestring = mimetypes ? g_strjoinv (", ", (gchar **) mimetypes) : NULL; - g_debug ("XAppFavorites: get_favorites returning list for mimetype '%s' (%d items)", + DEBUG ("XAppFavorites: get_favorites returning list for mimetype '%s' (%d items)", typestring, g_list_length (ret)); g_free (typestring); @@ -873,7 +876,7 @@ n = g_hash_table_size (priv->infos); - g_debug ("XAppFavorites: get_n_favorites returning number of items: %d.", n); + DEBUG ("XAppFavorites: get_n_favorites returning number of items: %d.", n); return n; } @@ -1011,7 +1014,7 @@ { if (error) { - g_debug ("XAppFavorites: launch: error opening uri '%s': %s", uri, error->message); + DEBUG ("XAppFavorites: launch: error opening uri '%s': %s", uri, error->message); g_error_free (error); } } @@ -1187,6 +1190,8 @@ "activate", G_CALLBACK (item_activated), data, (GClosureNotify) free_item_callback_data, 0); } + + g_list_free_full (fav_list, (GDestroyNotify) xapp_favorite_info_free); gtk_widget_show_all (GTK_WIDGET (menu)); } diff --git a/libxapp/xapp-gtk-window.c b/libxapp/xapp-gtk-window.c index 3a39929..66dcee3 100644 --- a/libxapp/xapp-gtk-window.c +++ b/libxapp/xapp-gtk-window.c @@ -11,6 +11,9 @@ #include #include "xapp-gtk-window.h" +#define DEBUG_FLAG XAPP_DEBUG_WINDOW +#include "xapp-debug.h" + #define ICON_NAME_HINT "_NET_WM_XAPP_ICON_NAME" #define PROGRESS_HINT "_NET_WM_XAPP_PROGRESS" #define PROGRESS_PULSE_HINT "_NET_WM_XAPP_PROGRESS_PULSE" @@ -72,7 +75,7 @@ if (g_once_init_enter (&once_init_value)) { running_x11 = GDK_IS_X11_DISPLAY(gdk_display_get_default()); - g_debug ("XAppGtkWindow: is_x11_session: %s\n", running_x11 ? "TRUE" : "FALSE"); + DEBUG ("XAppGtkWindow: is_x11_session: %s\n", running_x11 ? "TRUE" : "FALSE"); g_once_init_leave (&once_init_value, 1); } diff --git a/libxapp/xapp-gtk3-module.c b/libxapp/xapp-gtk3-module.c index 6de3e5a..3df9c69 100644 --- a/libxapp/xapp-gtk3-module.c +++ b/libxapp/xapp-gtk3-module.c @@ -3,6 +3,9 @@ #include "xapp-favorites.h" #include "favorite-vfs-file.h" + +#define DEBUG_FLAG XAPP_DEBUG_MODULE +#include "xapp-debug.h" #define ICON_OVERRIDE_VAR "XAPP_FORCE_GTKWINDOW_ICON" @@ -57,7 +60,7 @@ if (anti_recursion_ptr && anti_recursion_ptr == gtk_window_get_icon (window)) { - g_debug ("Window icon notify received, but anti-recurse pointer hasn't changed, returning."); + DEBUG ("Window icon notify received, but anti-recurse pointer hasn't changed, returning."); return; } @@ -65,7 +68,7 @@ { gboolean clear_pixbuf = FALSE; - g_debug ("Window icon changed, forcing back to '%s'", forced_icon_str); + DEBUG ("Window icon changed, forcing back to '%s'", forced_icon_str); g_signal_handlers_block_by_func (G_OBJECT (window), window_icon_changed, window); @@ -103,7 +106,7 @@ already_applied = 1; - g_debug ("Realize overridden window (%p).", widget); + DEBUG ("Realize overridden window (%p).", widget); const gchar *env_icon = g_getenv (ICON_OVERRIDE_VAR); @@ -122,7 +125,7 @@ { (* original_window_unrealize) (widget); - g_debug ("Unrealize overridden window (%p).", widget); + DEBUG ("Unrealize overridden window (%p).", widget); g_signal_handlers_disconnect_by_func (widget, window_icon_changed, widget); } @@ -135,7 +138,7 @@ // I don't think these guards are necessary. This should only run once, but better off safe. if (!applied) { - g_debug ("XAPP_FORCE_GTKWINDOW_ICON found in environment, overriding the window icon with its contents"); + DEBUG ("XAPP_FORCE_GTKWINDOW_ICON found in environment, overriding the window icon with its contents"); applied = TRUE; @@ -156,7 +159,7 @@ if (!applied) { - g_debug ("Adding a Favorites shortcut to GtkPlacesSideBars"); + DEBUG ("Adding a Favorites shortcut to GtkPlacesSideBars"); applied = TRUE; @@ -169,7 +172,7 @@ } G_MODULE_EXPORT void gtk_module_init (gint *argc, gchar ***argv[]) { - g_debug ("Initializing XApp GtkModule"); + DEBUG ("Initializing XApp GtkModule"); // This won't instantiate XAppFavorites but will register the uri so // it can be used by apps (like pix which doesn't use the favorites api, // but just adds favorites:/// to its sidebar.) diff --git a/libxapp/xapp-preferences-window.c b/libxapp/xapp-preferences-window.c index 630c14f..f98855c 100644 --- a/libxapp/xapp-preferences-window.c +++ b/libxapp/xapp-preferences-window.c @@ -60,6 +60,10 @@ gtk_widget_set_size_request (GTK_WIDGET (priv->side_switcher), 100, -1); gtk_box_pack_start (GTK_BOX (secondary_box), GTK_WIDGET (priv->side_switcher), FALSE, FALSE, 0); gtk_widget_set_no_show_all (GTK_WIDGET (priv->side_switcher), TRUE); + + // XAppStackSidebar calls show_all on itself during its init, we need to hide + // it here so our single/multiple page mechanism here works properly. + gtk_widget_hide (GTK_WIDGET (priv->side_switcher)); priv->stack = gtk_stack_new (); gtk_stack_set_transition_type (GTK_STACK (priv->stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE); diff --git a/libxapp/xapp-status-icon-monitor.c b/libxapp/xapp-status-icon-monitor.c index 06f7e09..f6fe07a 100644 --- a/libxapp/xapp-status-icon-monitor.c +++ b/libxapp/xapp-status-icon-monitor.c @@ -16,6 +16,9 @@ #include "xapp-status-icon.h" #include "xapp-status-icon-monitor.h" #include "xapp-statusicon-interface.h" + +#define DEBUG_FLAG XAPP_DEBUG_STATUS_ICON +#include "xapp-debug.h" #define MONITOR_NAME "org.x.StatusIconMonitor" @@ -85,7 +88,7 @@ "name", &name, NULL); - g_debug("XAppStatusIconMonitor: app name owner changed - name '%s' is now %s)", + DEBUG("App name owner changed - name '%s' is now %s)", name, owner != NULL ? "owned" : "unowned"); if (owner == NULL) @@ -154,7 +157,7 @@ g_object_get (obj_mgr, "name", &name, NULL); - g_debug("XAppStatusIconMonitor: Object manager added for new bus name: '%s'", name); + DEBUG("Object manager added for new bus name: '%s'", name); g_signal_connect (obj_mgr, "notify::name-owner", @@ -211,7 +214,7 @@ } else { - g_debug ("XAppStatusIconMonitor: adding object manager failed, bus name '%s' is invalid", name); + DEBUG ("Adding object manager failed, bus name '%s' is invalid", name); } g_strfreev (name_parts); @@ -248,7 +251,7 @@ /* the '.' at the end so we don't catch ourselves in this */ if (g_str_has_prefix (str, STATUS_ICON_MATCH)) { - g_debug ("XAppStatusIconMonitor: found new status icon app: %s", str); + DEBUG ("Found new status icon app: %s", str); add_object_manager_for_name (self, str); } } @@ -262,7 +265,7 @@ { XAppStatusIconMonitorPrivate *priv = xapp_status_icon_monitor_get_instance_private (self); - g_debug("XAppStatusIconMonitor: looking for status icon apps on the bus"); + DEBUG("Looking for status icon apps on the bus"); /* If there are no monitors (applets) already running when this is set up, * this won't find anything. The XAppStatusIcons will be in fallback mode, @@ -315,7 +318,7 @@ const gchar *old_owner; const gchar *new_owner; - g_debug("XAppStatusIconMonitor: NameOwnerChanged signal received: %s)", sender_name); + DEBUG ("NameOwnerChanged signal received: %s)", sender_name); g_variant_get (parameters, "(&s&s&s)", &name, &old_owner, &new_owner); @@ -330,7 +333,7 @@ { XAppStatusIconMonitorPrivate *priv = xapp_status_icon_monitor_get_instance_private (self); - g_debug ("XAppStatusIconMonitor: Adding NameOwnerChanged listener for status icon apps"); + DEBUG ("Adding NameOwnerChanged listener for status icon apps"); priv->listener_id = g_dbus_connection_signal_subscribe (priv->connection, "org.freedesktop.DBus", @@ -362,7 +365,7 @@ { XAppStatusIconMonitor *self = XAPP_STATUS_ICON_MONITOR (user_data); - g_debug ("XAppStatusIconMonitor: Name owned on bus: %s", name); + DEBUG ("Name owned on bus: %s", name); add_name_listener (self); find_and_add_icons (self); @@ -377,7 +380,7 @@ XAppStatusIconMonitor *self = XAPP_STATUS_ICON_MONITOR (user_data); XAppStatusIconMonitorPrivate *priv = xapp_status_icon_monitor_get_instance_private (self); - g_debug ("XAppStatusIconMonitor: Connected to bus: %s", name); + DEBUG ("Connected to bus: %s", name); priv->connection = connection; } @@ -393,7 +396,7 @@ owned_name = g_strdup_printf ("%s.%s_%d", MONITOR_NAME, valid_app_name, unique_id++); g_free (valid_app_name); - g_debug ("XAppStatusIconMonitor: Attempting to own name on bus: %s", owned_name); + DEBUG ("Attempting to own name on bus: %s", owned_name); priv->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, owned_name, @@ -424,7 +427,7 @@ XAppStatusIconMonitor *self = XAPP_STATUS_ICON_MONITOR (object); XAppStatusIconMonitorPrivate *priv = xapp_status_icon_monitor_get_instance_private (self); - g_debug ("XAppStatusIconMonitor dispose (%p)", object); + DEBUG ("XAppStatusIconMonitor dispose (%p)", object); if (priv->connection != NULL) { @@ -455,7 +458,7 @@ static void xapp_status_icon_monitor_finalize (GObject *object) { - g_debug ("XAppStatusIconMonitor finalize (%p)", object); + DEBUG ("XAppStatusIconMonitor finalize (%p)", object); G_OBJECT_CLASS (xapp_status_icon_monitor_parent_class)->dispose (object); } diff --git a/libxapp/xapp-status-icon.c b/libxapp/xapp-status-icon.c index 57be16f..db33af6 100644 --- a/libxapp/xapp-status-icon.c +++ b/libxapp/xapp-status-icon.c @@ -16,6 +16,9 @@ #include "xapp-status-icon.h" #include "xapp-statusicon-interface.h" #include "xapp-enums.h" + +#define DEBUG_FLAG XAPP_DEBUG_STATUS_ICON +#include "xapp-debug.h" #define FDO_DBUS_NAME "org.freedesktop.DBus" #define FDO_DBUS_PATH "/org/freedesktop/DBus" @@ -271,7 +274,7 @@ g_return_if_fail (XAPP_IS_STATUS_ICON (user_data)); XAppStatusIcon *icon = XAPP_STATUS_ICON (user_data); - g_debug ("XAppStatusIcon: Primary menu unmapped"); + DEBUG ("Primary menu unmapped"); if (icon->priv->state == XAPP_STATUS_ICON_STATE_NATIVE) { @@ -288,7 +291,7 @@ g_return_if_fail (XAPP_IS_STATUS_ICON (user_data)); XAppStatusIcon *icon = XAPP_STATUS_ICON (user_data); - g_debug ("XAppStatusIcon: Secondary menu unmapped"); + DEBUG ("Secondary menu unmapped"); if (icon->priv->state == XAPP_STATUS_ICON_STATE_NATIVE) { @@ -312,7 +315,7 @@ GdkRectangle win_rect; GdkGravity rect_anchor, menu_anchor; - g_debug ("XAppStatusIcon: Popup menu on behalf of application"); + DEBUG ("Popup menu on behalf of application"); if (!gtk_widget_get_realized (GTK_WIDGET (menu))) { @@ -439,14 +442,14 @@ if (g_strcmp0 (name, "ButtonPress") == 0) { - g_debug ("XAppStatusIcon: received ButtonPress from monitor %s: " + DEBUG ("Received ButtonPress from monitor %s: " "pos:%d,%d , button: %s , time: %u , orientation: %s", g_dbus_method_invocation_get_sender (invocation), x, y, button_to_str (button), _time, panel_position_to_str (panel_position)); if (should_send_activate (icon, button)) { - g_debug ("XAppStatusIcon: native sending 'activate' for %s button", button_to_str (button)); + DEBUG ("Native sending 'activate' for %s button", button_to_str (button)); g_signal_emit (icon, signals[ACTIVATE], 0, button, _time); @@ -466,7 +469,7 @@ else if (g_strcmp0 (name, "ButtonRelease") == 0) { - g_debug ("XAppStatusIcon: received ButtonRelease from monitor %s: " + DEBUG ("Received ButtonRelease from monitor %s: " "pos:%d,%d , button: %s , time: %u , orientation: %s", g_dbus_method_invocation_get_sender (invocation), x, y, button_to_str (button), _time, panel_position_to_str (panel_position)); @@ -509,7 +512,7 @@ guint _time, XAppStatusIcon *icon) { - g_debug ("XAppStatusIcon: received Scroll from monitor %s: " + DEBUG ("Received Scroll from monitor %s: " "delta: %d , direction: %s , time: %u", g_dbus_method_invocation_get_sender (invocation), delta, direction_to_str (direction), _time); @@ -606,13 +609,13 @@ button = event->button.button; _time = event->button.time; - g_debug ("XAppStatusIcon: GtkStatusIcon button-press-event with %s button", button_to_str (button)); + DEBUG ("GtkStatusIcon button-press-event with %s button", button_to_str (button)); /* We always send 'activate' for a button that has no corresponding menu, * and for middle clicks. */ if (should_send_activate (icon, button)) { - g_debug ("XAppStatusIcon: GtkStatusIcon activated by %s button", button_to_str (button)); + DEBUG ("GtkStatusIcon activated by %s button", button_to_str (button)); g_signal_emit (icon, signals[ACTIVATE], 0, button, @@ -650,7 +653,7 @@ button = event->button.button; _time = event->button.time; - g_debug ("XAppStatusIcon: GtkStatusIcon button-release-event with %s button", button_to_str (button)); + DEBUG ("GtkStatusIcon button-release-event with %s button", button_to_str (button)); /* Native icons can have two menus, so we must determine which to use based * on the gtk icon event's button. */ @@ -665,7 +668,7 @@ if (menu_to_use) { - g_debug ("XAppStatusIcon: GtkStatusIcon popup menu for %s button", button_to_str (button)); + DEBUG ("GtkStatusIcon popup menu for %s button", button_to_str (button)); popup_menu (icon, GTK_MENU (menu_to_use), @@ -695,7 +698,7 @@ gpointer user_data) { XAppStatusIcon *self = XAPP_STATUS_ICON (user_data); - g_debug("XAppStatusIcon: NameOwnerChanged signal received, refreshing icon"); + DEBUG("NameOwnerChanged signal received, refreshing icon"); refresh_icon (self); } @@ -703,7 +706,7 @@ static void add_name_listener (XAppStatusIcon *self) { - g_debug ("XAppStatusIcon: Adding NameOwnerChanged listener for status monitors"); + DEBUG ("Adding NameOwnerChanged listener for status monitors"); self->priv->listener_id = g_dbus_connection_signal_subscribe (self->priv->connection, FDO_DBUS_NAME, @@ -763,7 +766,7 @@ sync_skeleton (self); - g_debug ("XAppStatusIcon: name acquired on dbus, syncing icon properties. State is now: %s", + DEBUG ("Name acquired on dbus, syncing icon properties. State is now: %s", state_to_str (self->priv->state)); g_signal_emit (self, signals[STATE_CHANGED], 0, self->priv->state); } @@ -785,7 +788,7 @@ obj_server_finalized (gpointer data, GObject *object) { - g_debug ("XAppStatusIcon: Final icon removed, clearing object manager (%s)", g_get_prgname ()); + DEBUG ("Final icon removed, clearing object manager (%s)", g_get_prgname ()); if (name_owner_id > 0) { @@ -801,7 +804,7 @@ { if (obj_server == NULL) { - g_debug ("XAppStatusIcon: New object manager for (%s)", g_get_prgname ()); + DEBUG ("New object manager for (%s)", g_get_prgname ()); obj_server = g_dbus_object_manager_server_new (ICON_BASE_PATH); g_dbus_object_manager_server_set_connection (obj_server, self->priv->connection); @@ -877,7 +880,7 @@ if (name_owner_id == 0) { - g_debug ("XAppStatusIcon: Attempting to own name on bus '%s'", owner_name); + DEBUG ("Attempting to own name on bus '%s'", owner_name); name_owner_id = g_bus_own_name_on_connection (self->priv->connection, owner_name, G_BUS_NAME_OWNER_FLAGS_DO_NOT_QUEUE, @@ -940,7 +943,7 @@ priv->state = XAPP_STATUS_ICON_STATE_NO_SUPPORT; } - g_debug ("XAppStatusIcon fallback icon embedded_changed. State is now %s", + DEBUG ("Fallback icon embedded_changed. State is now %s", state_to_str (priv->state)); g_signal_emit (self, signals[STATE_CHANGED], 0, priv->state); } @@ -950,7 +953,7 @@ { XAppStatusIconPrivate *priv = self->priv; - g_debug ("XAppStatusIcon: falling back to GtkStatusIcon"); + DEBUG ("Falling back to GtkStatusIcon"); remove_icon_path_from_bus (self); @@ -1002,7 +1005,7 @@ } else { - g_debug ("XAppStatusIcon: attempt to ListNames cancelled"); + DEBUG ("Attempt to ListNames cancelled"); } g_error_free (error); @@ -1017,7 +1020,7 @@ { if (g_str_has_prefix (str, STATUS_ICON_MONITOR_MATCH)) { - g_debug ("XAppStatusIcon: Discovered active status monitor (%s)", str); + DEBUG ("Discovered active status monitor (%s)", str); found = TRUE; } } @@ -1048,7 +1051,7 @@ look_for_status_applet (XAppStatusIcon *self) { // Check that there is at least one applet on DBUS - g_debug("XAppStatusIcon: Looking for status monitors"); + DEBUG("Looking for status monitors"); cancellable_reset (self); @@ -1113,7 +1116,7 @@ } else { - g_debug ("XAppStatusIcon: Cancelled session bus acquire"); + DEBUG ("Cancelled session bus acquire"); } g_error_free (error); @@ -1128,7 +1131,7 @@ { if (self->priv->connection == NULL) { - g_debug ("XAppStatusIcon: Connecting to session bus"); + DEBUG ("Connecting to session bus"); cancellable_reset (self); @@ -1217,7 +1220,7 @@ self->priv->icon_size = FALLBACK_ICON_SIZE; self->priv->icon_name = g_strdup (" "); - g_debug ("XAppStatusIcon: init: application name: '%s'", self->priv->name); + DEBUG ("Init: application name: '%s'", self->priv->name); // Default to visible (the same behavior as GtkStatusIcon) self->priv->visible = TRUE; @@ -1235,7 +1238,7 @@ const gchar *path; path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self->priv->object_skeleton)); - g_debug ("XAppStatusIcon: removing interface at path '%s'", path); + DEBUG ("Removing interface at path '%s'", path); g_dbus_object_manager_server_unexport (obj_server, path); self->priv->interface_skeleton = NULL; @@ -1250,7 +1253,7 @@ { XAppStatusIcon *self = XAPP_STATUS_ICON (object); - g_debug ("XAppStatusIcon dispose (%p)", object); + DEBUG ("XAppStatusIcon dispose (%p)", object); g_free (self->priv->name); g_free (self->priv->icon_name); @@ -1287,7 +1290,7 @@ static void xapp_status_icon_finalize (GObject *object) { - g_debug ("XAppStatusIcon finalize (%p)", object); + DEBUG ("XAppStatusIcon finalize (%p)", object); g_clear_object (&XAPP_STATUS_ICON (object)->priv->cancellable); @@ -1522,7 +1525,7 @@ g_clear_pointer (&icon->priv->name, g_free); icon->priv->name = g_strdup (name); - g_debug ("XAppStatusIcon set_name: %s", name); + DEBUG ("set_name: %s", name); if (icon->priv->interface_skeleton) { @@ -1561,7 +1564,7 @@ g_clear_pointer (&icon->priv->icon_name, g_free); icon->priv->icon_name = g_strdup (icon_name); - g_debug ("XAppStatusIcon set_icon_name: %s", icon_name); + DEBUG ("set_icon_name: %s", icon_name); if (icon->priv->interface_skeleton) { @@ -1588,7 +1591,7 @@ if (icon->priv->interface_skeleton == NULL) { - g_debug ("XAppStatusIcon get_icon_size: %d (fallback)", FALLBACK_ICON_SIZE); + DEBUG ("get_icon_size: %d (fallback)", FALLBACK_ICON_SIZE); return FALLBACK_ICON_SIZE; } @@ -1597,7 +1600,7 @@ size = xapp_status_icon_interface_get_icon_size (icon->priv->interface_skeleton); - g_debug ("XAppStatusIcon get_icon_size: %d", size); + DEBUG ("get_icon_size: %d", size); return size; } @@ -1624,7 +1627,7 @@ g_clear_pointer (&icon->priv->tooltip_text, g_free); icon->priv->tooltip_text = g_strdup (tooltip_text); - g_debug ("XAppStatusIcon set_tooltip_text: %s", tooltip_text); + DEBUG ("set_tooltip_text: %s", tooltip_text); if (icon->priv->interface_skeleton) { @@ -1656,7 +1659,7 @@ g_clear_pointer (&icon->priv->label, g_free); icon->priv->label = g_strdup (label); - g_debug ("XAppStatusIcon set_label: '%s'", label); + DEBUG ("set_label: '%s'", label); if (icon->priv->interface_skeleton) { @@ -1685,7 +1688,7 @@ icon->priv->visible = visible; - g_debug ("XAppStatusIcon set_visible: %s", visible ? "TRUE" : "FALSE"); + DEBUG ("set_visible: %s", visible ? "TRUE" : "FALSE"); if (icon->priv->interface_skeleton) { @@ -1710,7 +1713,7 @@ { g_return_val_if_fail (XAPP_IS_STATUS_ICON (icon), FALSE); - g_debug ("XAppStatusIcon get_visible: %s", icon->priv->visible ? "TRUE" : "FALSE"); + DEBUG ("get_visible: %s", icon->priv->visible ? "TRUE" : "FALSE"); return icon->priv->visible; } @@ -1775,7 +1778,7 @@ g_clear_object (&icon->priv->primary_menu); - g_debug ("XAppStatusIcon set_primary_menu: %p", menu); + DEBUG ("set_primary_menu: %p", menu); if (menu) { @@ -1799,7 +1802,7 @@ { g_return_val_if_fail (XAPP_IS_STATUS_ICON (icon), NULL); - g_debug ("XAppStatusIcon get_menu: %p", icon->priv->primary_menu); + DEBUG ("get_menu: %p", icon->priv->primary_menu); return icon->priv->primary_menu; } @@ -1827,7 +1830,7 @@ g_clear_object (&icon->priv->secondary_menu); - g_debug ("XAppStatusIcon set_secondary_menu: %p", menu); + DEBUG ("set_secondary_menu: %p", menu); if (menu) { @@ -1851,7 +1854,7 @@ { g_return_val_if_fail (XAPP_IS_STATUS_ICON (icon), NULL); - g_debug ("XAppStatusIcon get_menu: %p", icon->priv->secondary_menu); + DEBUG ("get_menu: %p", icon->priv->secondary_menu); return icon->priv->secondary_menu; } @@ -1907,7 +1910,7 @@ { g_return_val_if_fail (XAPP_IS_STATUS_ICON (icon), XAPP_STATUS_ICON_STATE_NO_SUPPORT); - g_debug ("XAppStatusIcon get_state: %s", state_to_str (icon->priv->state)); + DEBUG ("get_state: %s", state_to_str (icon->priv->state)); return icon->priv->state; } @@ -1930,7 +1933,7 @@ g_return_if_fail (XAPP_IS_STATUS_ICON (icon)); gchar *old_meta; - g_debug ("XAppStatusIcon set_metadata: '%s'", metadata); + DEBUG ("set_metadata: '%s'", metadata); if (g_strcmp0 (metadata, icon->priv->metadata) == 0) { @@ -1963,7 +1966,7 @@ GError *error; gboolean found; - g_debug("XAppStatusIcon: any_monitors: Looking for status monitors"); + DEBUG("Looking for status monitors"); error = NULL; found = FALSE; @@ -1997,7 +2000,7 @@ { if (g_str_has_prefix (str, STATUS_ICON_MONITOR_MATCH)) { - g_debug ("XAppStatusIcon: any_monitors: discovered active status monitor (%s)", str); + DEBUG ("Discovered active status monitor (%s)", str); found = TRUE; @@ -2015,11 +2018,11 @@ if (error) { - g_warning ("XAppStatusIcon: any_monitors: Unable to check for monitors: %s", error->message); + g_warning ("Unable to check for monitors: %s", error->message); g_error_free (error); } - g_debug ("XAppStatusIcon: any_monitors: %s", found ? "TRUE" : "FALSE"); + DEBUG ("Monitors found: %s", found ? "TRUE" : "FALSE"); return found; } diff --git a/libxapp/xapp-style-manager.c b/libxapp/xapp-style-manager.c new file mode 100644 index 0000000..97c46fe --- /dev/null +++ b/libxapp/xapp-style-manager.c @@ -0,0 +1,276 @@ +#include "xapp-style-manager.h" +#include "xapp-util.h" + +/** + * SECTION:xapp-style-manager + * @Short_description: Convenience class for adding on the fly styling to gtk widgets. + * @Title: XAppStyleManager + * + * #XAppStyleManager is a convenience class designed to make it easier to programmatically add style information to a widget. + */ +struct _XAppStyleManager +{ + GObject parent_instance; + + GHashTable *properties; + GtkWidget *widget; + GtkCssProvider *provider; + gchar *class_name; +}; + +G_DEFINE_TYPE (XAppStyleManager, xapp_style_manager, G_TYPE_OBJECT) + +enum +{ + PROP_0, + PROP_WIDGET, + N_PROPERTIES +}; + +static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, }; + +static gint next_id = 0; + +static void +process_property_list_update (XAppStyleManager *style_manager) +{ + GString *css_text = g_string_new (""); + GHashTableIter iter; + gpointer key, value; + gchar *raw_text; + + g_string_append (css_text, "."); + g_string_append (css_text, style_manager->class_name); + g_string_append (css_text, "{"); + + g_hash_table_iter_init (&iter, style_manager->properties); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + g_string_append (css_text, (const gchar*) key); + g_string_append (css_text, ":"); + g_string_append (css_text, (const gchar*) value); + g_string_append (css_text, ";"); + } + g_string_append (css_text, "}"); + + raw_text = g_string_free (css_text, FALSE); + gtk_css_provider_load_from_data (style_manager->provider, raw_text, -1, NULL); + g_free (raw_text); +} + +static void +xapp_style_manager_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + XAppStyleManager *style_manager = XAPP_STYLE_MANAGER (object); + + switch (prop_id) + { + case PROP_WIDGET: + xapp_style_manager_set_widget (style_manager, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +xapp_style_manager_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + XAppStyleManager *style_manager = XAPP_STYLE_MANAGER (object); + + switch (prop_id) + { + case PROP_WIDGET: + g_value_set_object (value, xapp_style_manager_get_widget (style_manager)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +xapp_style_manager_init (XAppStyleManager *style_manager) +{ + style_manager->provider = gtk_css_provider_new (); + style_manager->class_name = g_strdup_printf ("xapp-%d", next_id); + next_id++; + + style_manager->properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + style_manager->widget = NULL; +} + +static void +xapp_style_manager_dispose (GObject *object) +{ + XAppStyleManager *style_manager = XAPP_STYLE_MANAGER (object); + + xapp_style_manager_set_widget (style_manager, NULL); + g_hash_table_unref (style_manager->properties); + g_object_unref (style_manager->provider); + g_free (style_manager->class_name); + + G_OBJECT_CLASS (xapp_style_manager_parent_class)->dispose (object); +} + +static void +xapp_style_manager_class_init (XAppStyleManagerClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = xapp_style_manager_dispose; + object_class->set_property = xapp_style_manager_set_property; + object_class->get_property = xapp_style_manager_get_property; + + /** + * XAppStyleManager:widget: + * + * The widget to be styled. + */ + obj_properties[PROP_WIDGET] = + g_param_spec_object ("widget", + "Widget", + "The widget to be styled.", + GTK_TYPE_WIDGET, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY); + + g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties); +} + +/** + * xapp_style_manager_new: + * + * Creates a new #XAppStyleManager instance + * + * Returns: (transfer full): a new #XAppStyleManager. Use g_object_unref when finished. + * + * Since: 2.2 + */ +XAppStyleManager * +xapp_style_manager_new (void) +{ + XAppStyleManager *style_manager; + style_manager = g_object_new (XAPP_TYPE_STYLE_MANAGER, NULL); + + return style_manager; +} + +/** + * xapp_style_manager_get_widget: + * @style_manager: a #XAppStyleManager + * + * Gets the #GtkWidget the style manager currently applies styles to. + * + * Returns: (transfer none): the #GtkWidget previously set on the style manager, or %NULL. + * + * Since: 2.2 + */ +GtkWidget * +xapp_style_manager_get_widget (XAppStyleManager *style_manager) +{ + return style_manager->widget; +} + +/** + * xapp_style_manager_set_widget: + * @style_manager: a #XAppStyleManager + * @widget: the #GtkWidget that the style manager will apply styles to, or + * %NULL to unset the current widget and remove all styles currently set by + * this #XAppStyleManager instance. + * + * Sets the #GtkWidget the style manager will apply styles to. + * + * Since: 2.2 + */ +void +xapp_style_manager_set_widget (XAppStyleManager *style_manager, + GtkWidget *widget) +{ + GtkStyleContext *context; + + if (style_manager->widget) + { + context = gtk_widget_get_style_context (style_manager->widget); + gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (style_manager->provider)); + gtk_style_context_remove_class (context, style_manager->class_name); + } + + if (!widget) + { + style_manager->widget = NULL; + return; + } + + style_manager->widget = widget; + context = gtk_widget_get_style_context (widget); + + gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (style_manager->provider), 700); + gtk_style_context_add_class (context, style_manager->class_name); +} + +/** + * xapp_style_manager_set_style_property: + * @style_manager: a #XAppStyleManager + * @name: the property name + * @value: the value to set the property to + * + * Adds the given style property to the widget. If the property has already been set, the value will be replaced. + * + * Since: 2.2 + */ +void +xapp_style_manager_set_style_property (XAppStyleManager *style_manager, + const gchar *name, + const gchar *value) +{ + g_hash_table_insert (style_manager->properties, g_strdup (name), g_strdup (value)); + + process_property_list_update (style_manager); +} + +/** + * xapp_style_manager_remove_style_property: + * @style_manager: a #XAppStyleManager + * @name: the property name + * + * Removes the given style property from the widget if set. + * + * Since: 2.2 + */ +void +xapp_style_manager_remove_style_property (XAppStyleManager *style_manager, + const gchar *name) +{ + if (!g_hash_table_lookup (style_manager->properties, name)) + return; + + g_hash_table_remove (style_manager->properties, name); + + process_property_list_update (style_manager); +} + +/** + * xapp_style_manager_set_from_pango_font_string: + * @style_manager: a #XAppStyleManager + * @desc_string: a pango font description string + * + * Sets the css font property on the widget based on the supplied pango font description string. + * + * Since: 2.2 + */ +void +xapp_style_manager_set_from_pango_font_string (XAppStyleManager *style_manager, + const gchar *desc_string) +{ + gchar *css_string = xapp_pango_font_string_to_css (desc_string); + + xapp_style_manager_set_style_property (style_manager, "font", css_string); + g_free (css_string); +} diff --git a/libxapp/xapp-style-manager.h b/libxapp/xapp-style-manager.h new file mode 100644 index 0000000..2acad36 --- /dev/null +++ b/libxapp/xapp-style-manager.h @@ -0,0 +1,27 @@ +#ifndef __XAPP_STYLE_MANAGER_H__ +#define __XAPP_STYLE_MANAGER_H__ + +#include + +G_BEGIN_DECLS + +#define XAPP_TYPE_STYLE_MANAGER xapp_style_manager_get_type () +G_DECLARE_FINAL_TYPE (XAppStyleManager, xapp_style_manager, XAPP, STYLE_MANAGER, GObject) + +XAppStyleManager *xapp_style_manager_new (void); + +GtkWidget *xapp_style_manager_get_widget (XAppStyleManager *style_manager); +void xapp_style_manager_set_widget (XAppStyleManager *style_manager, + GtkWidget *widget); +void xapp_style_manager_set_style_property (XAppStyleManager *style_manager, + const gchar *name, + const gchar *value); +void xapp_style_manager_remove_style_property (XAppStyleManager *style_manager, + const gchar *name); + +void xapp_style_manager_set_from_pango_font_string (XAppStyleManager *style_manager, + const gchar *desc_string); + +G_END_DECLS + +#endif /* __XAPP_STYLE_MANAGER_H__ */ diff --git a/libxapp/xapp-util.c b/libxapp/xapp-util.c index 1cef67f..5da62db 100644 --- a/libxapp/xapp-util.c +++ b/libxapp/xapp-util.c @@ -3,6 +3,7 @@ #include #include +#include #include "xapp-util.h" @@ -104,3 +105,143 @@ return session_running; } + +/** + * xapp_pango_font_string_to_css: + * @pango_font_string: a pango font description string + * + * Converts a pango font description string to a string suitable for use with the css "font" tag. The font description must contain the font family and font size or conversion will fail and %NULL will be returned + * + * Returns: (transfer full) the css compatible font string or %NULL if the conversion failed. + * + * Since: 2.2 + */ +gchar * +xapp_pango_font_string_to_css (const char *pango_font_string) +{ + PangoFontDescription *desc; + GString *font_string; + PangoFontMask set; + + desc = pango_font_description_from_string (pango_font_string); + font_string = g_string_new (""); + + set = pango_font_description_get_set_fields (desc); + + if (!(set & PANGO_FONT_MASK_SIZE) || !(set & PANGO_FONT_MASK_FAMILY)) + { + return NULL; + } + + if (set & PANGO_FONT_MASK_STYLE) + { + switch (pango_font_description_get_style (desc)) + { + case PANGO_STYLE_NORMAL: + g_string_append (font_string, "normal "); + break; + case PANGO_STYLE_OBLIQUE: + g_string_append (font_string, "oblique "); + break; + case PANGO_STYLE_ITALIC: + g_string_append (font_string, "italic "); + break; + default: + break; + } + } + + if (set & PANGO_FONT_MASK_VARIANT) + { + switch (pango_font_description_get_variant (desc)) + { + case PANGO_VARIANT_NORMAL: + g_string_append (font_string, "normal "); + break; + case PANGO_VARIANT_SMALL_CAPS: + g_string_append (font_string, "small-caps "); + break; + default: + break; + } + } + + if (set & PANGO_FONT_MASK_WEIGHT) + { + switch (pango_font_description_get_weight (desc)) + { + case PANGO_WEIGHT_THIN: + g_string_append (font_string, "100 "); + break; + case PANGO_WEIGHT_ULTRALIGHT: + g_string_append (font_string, "200 "); + break; + case PANGO_WEIGHT_LIGHT: + case PANGO_WEIGHT_SEMILIGHT: + g_string_append (font_string, "300 "); + break; + case PANGO_WEIGHT_BOOK: + case PANGO_WEIGHT_NORMAL: + g_string_append (font_string, "400 "); + break; + case PANGO_WEIGHT_MEDIUM: + g_string_append (font_string, "500 "); + break; + case PANGO_WEIGHT_SEMIBOLD: + g_string_append (font_string, "600 "); + break; + case PANGO_WEIGHT_BOLD: + g_string_append (font_string, "700 "); + break; + case PANGO_WEIGHT_ULTRABOLD: + g_string_append (font_string, "800 "); + break; + case PANGO_WEIGHT_HEAVY: + case PANGO_WEIGHT_ULTRAHEAVY: + g_string_append (font_string, "900 "); + break; + default: + break; + } + } + + if (set & PANGO_FONT_MASK_STRETCH) + { + switch (pango_font_description_get_stretch (desc)) + { + case PANGO_STRETCH_ULTRA_CONDENSED: + g_string_append (font_string, "ultra-condensed "); + break; + case PANGO_STRETCH_EXTRA_CONDENSED: + g_string_append (font_string, "extra-condensed "); + break; + case PANGO_STRETCH_CONDENSED: + g_string_append (font_string, "condensed "); + break; + case PANGO_STRETCH_SEMI_CONDENSED: + g_string_append (font_string, "semi-condensed "); + break; + case PANGO_STRETCH_NORMAL: + g_string_append (font_string, "normal "); + break; + case PANGO_STRETCH_SEMI_EXPANDED: + g_string_append (font_string, "semi-expanded "); + break; + case PANGO_STRETCH_EXPANDED: + g_string_append (font_string, "expanded "); + break; + case PANGO_STRETCH_EXTRA_EXPANDED: + break; + case PANGO_STRETCH_ULTRA_EXPANDED: + g_string_append (font_string, "ultra-expanded "); + break; + default: + break; + } + } + + g_string_append_printf (font_string, "%dpx ", pango_font_description_get_size (desc) / PANGO_SCALE); + g_string_append (font_string, pango_font_description_get_family (desc)); + + return g_string_free (font_string, FALSE); +} diff --git a/libxapp/xapp-util.h b/libxapp/xapp-util.h index 87d1675..f5e4338 100644 --- a/libxapp/xapp-util.h +++ b/libxapp/xapp-util.h @@ -8,5 +8,8 @@ gboolean xapp_util_gpu_offload_supported (void); gboolean xapp_util_get_session_is_running (void); +gchar *xapp_pango_font_string_to_css (const char *pango_font_string); + + G_END_DECLS #endif /* __XAPP_UTIL_H__ */ diff --git a/meson.build b/meson.build index 7d50f79..7097f98 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('xapp', 'c', - version : '2.0.7', + version : '2.2.2', default_options : [ 'buildtype=debugoptimized' ], ) diff --git a/po/LINGUAS b/po/LINGUAS index 155a6e1..06d3507 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -2,6 +2,7 @@ am ar az +be ber bg bn @@ -35,6 +36,7 @@ kk ko ku +la lt mai ms diff --git a/po/af.po b/po/af.po index 8de9ce0..5871db4 100644 --- a/po/af.po +++ b/po/af.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/am.po b/po/am.po index f54bdeb..2444f14 100644 --- a/po/am.po +++ b/po/am.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ar.po b/po/ar.po index dadb319..af04dc9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/az.po b/po/az.po index e38dce7..84ebeb7 100644 --- a/po/az.po +++ b/po/az.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/be.po b/po/be.po new file mode 100644 index 0000000..dbe6071 --- /dev/null +++ b/po/be.po @@ -0,0 +1,172 @@ +# Belarusian translation for linuxmint +# Copyright (c) 2021 Rosetta Contributors and Canonical Ltd 2021 +# This file is distributed under the same license as the linuxmint package. +# FIRST AUTHOR , 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: linuxmint\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2020-11-25 11:16+0000\n" +"PO-Revision-Date: 2021-05-23 11:49+0000\n" +"Last-Translator: Anton Hryb \n" +"Language-Team: Belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" + +#: libxapp/favorite-vfs-file.c:463 +msgid "Favorites" +msgstr "Абраныя" + +#: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 +#: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 +#: libxapp/favorite-vfs-file.c:1053 libxapp/favorite-vfs-file.c:1082 +#: libxapp/favorite-vfs-file.c:1115 libxapp/favorite-vfs-file.c:1142 +#: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 +#: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 +msgid "Operation not supported" +msgstr "Аперацыя не падтрымліваецца" + +#: libxapp/xapp-icon-chooser-button.c:207 +#: libxapp/xapp-icon-chooser-dialog.c:639 +msgid "Icon size" +msgstr "Памер значка" + +#: libxapp/xapp-icon-chooser-button.c:208 +#: libxapp/xapp-icon-chooser-dialog.c:640 +msgid "The preferred icon size." +msgstr "Пераважны памер значка." + +#: libxapp/xapp-icon-chooser-button.c:222 +msgid "Icon" +msgstr "Значок" + +#: libxapp/xapp-icon-chooser-button.c:223 +msgid "The string representing the icon." +msgstr "Радок, які прадстаўляе значок." + +#: libxapp/xapp-icon-chooser-button.c:234 +msgid "Category" +msgstr "Катэгорыя" + +#: libxapp/xapp-icon-chooser-button.c:235 +msgid "The default category." +msgstr "Катэгорыя па змаўчанні." + +#: libxapp/xapp-icon-chooser-dialog.c:98 +msgid "Actions" +msgstr "Дзеянні" + +#: libxapp/xapp-icon-chooser-dialog.c:101 +msgid "Applications" +msgstr "Праграмы" + +#: libxapp/xapp-icon-chooser-dialog.c:104 +msgid "Categories" +msgstr "Катэгорыі" + +#: libxapp/xapp-icon-chooser-dialog.c:107 +msgid "Devices" +msgstr "Прылады" + +#: libxapp/xapp-icon-chooser-dialog.c:110 +msgid "Emblems" +msgstr "Эмблемы" + +#: libxapp/xapp-icon-chooser-dialog.c:113 +msgid "Emoji" +msgstr "Эмодзі" + +#: libxapp/xapp-icon-chooser-dialog.c:116 +msgid "Mime types" +msgstr "Тыпы міма" + +#: libxapp/xapp-icon-chooser-dialog.c:119 +msgid "Places" +msgstr "Месцы" + +#: libxapp/xapp-icon-chooser-dialog.c:122 +msgid "Status" +msgstr "Стан" + +#: libxapp/xapp-icon-chooser-dialog.c:125 +msgid "Other" +msgstr "Іншае" + +#: libxapp/xapp-icon-chooser-dialog.c:454 +msgid "Choose an icon" +msgstr "Выберыце значок" + +#: libxapp/xapp-icon-chooser-dialog.c:476 +msgid "Search" +msgstr "Пошук" + +#: libxapp/xapp-icon-chooser-dialog.c:483 +msgid "Browse" +msgstr "Аглядзець" + +#: libxapp/xapp-icon-chooser-dialog.c:539 +msgid "Loading..." +msgstr "Загрузка..." + +#: libxapp/xapp-icon-chooser-dialog.c:586 +msgid "Default" +msgstr "Перадвызначана" + +#: libxapp/xapp-icon-chooser-dialog.c:596 +msgid "Select" +msgstr "Выбраць" + +#: libxapp/xapp-icon-chooser-dialog.c:605 +#: libxapp/xapp-icon-chooser-dialog.c:1936 +msgid "Cancel" +msgstr "Скасаваць" + +#: libxapp/xapp-icon-chooser-dialog.c:652 +msgid "Allow Paths" +msgstr "Дазволіць шляхі" + +#: libxapp/xapp-icon-chooser-dialog.c:653 +msgid "Whether to allow paths." +msgstr "Ці дазваляць шляхі." + +#: libxapp/xapp-icon-chooser-dialog.c:664 +msgid "Default Icon" +msgstr "Перадвызначаны значок" + +#: libxapp/xapp-icon-chooser-dialog.c:665 +msgid "The icon to use by default" +msgstr "Значок выкарыстоўваецца па змаўчанні" + +#: libxapp/xapp-icon-chooser-dialog.c:1933 +msgid "Select image file" +msgstr "Выбраць выяву" + +#: libxapp/xapp-icon-chooser-dialog.c:1938 +msgid "Open" +msgstr "Адчыніць" + +#: libxapp/xapp-icon-chooser-dialog.c:1953 +msgid "Image" +msgstr "Выява" + +#: status-applets/mate/mate-xapp-status-applet.py:330 +msgid "About" +msgstr "Аб праграме" + +#: status-applets/mate/mate-xapp-status-applet.py:350 +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:7 +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:11 +msgid "Area where XApp status icons appear" +msgstr "Вобласць, у якой з'яўляецца XApp стан значка" + +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:6 +msgid "XApp Status Applet Factory" +msgstr "XApp Status Applet Factory" + +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:10 +msgid "XApp Status Applet" +msgstr "XApp Status Applet" diff --git a/po/ber.po b/po/ber.po index e061fe7..dadfa72 100644 --- a/po/ber.po +++ b/po/ber.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/bg.po b/po/bg.po index da0451e..8c260ce 100644 --- a/po/bg.po +++ b/po/bg.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/bn.po b/po/bn.po index 6a25d60..d8033ac 100644 --- a/po/bn.po +++ b/po/bn.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ca.po b/po/ca.po index 2d56c4c..1e06dd9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ca@valencia.po b/po/ca@valencia.po index 9fe87cc..15703e6 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/cs.po b/po/cs.po index 2a52fd1..53d5411 100644 --- a/po/cs.po +++ b/po/cs.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/cy.po b/po/cy.po index 3dfd79e..07153f6 100644 --- a/po/cy.po +++ b/po/cy.po @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" "PO-Revision-Date: 2020-11-30 19:08+0000\n" -"Last-Translator: Rhoslyn Prys \n" +"Last-Translator: Rhoslyn Prys \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" "Language: cy\n" #: libxapp/favorite-vfs-file.c:463 diff --git a/po/da.po b/po/da.po index 8c7d73a..7135236 100644 --- a/po/da.po +++ b/po/da.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/de.po b/po/de.po index fe68dd9..b962403 100644 --- a/po/de.po +++ b/po/de.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/el.po b/po/el.po index dcf4067..b1881d3 100644 --- a/po/el.po +++ b/po/el.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-06-26 21:36+0000\n" -"Last-Translator: Antonis Kirikos \n" +"PO-Revision-Date: 2021-01-13 16:19+0000\n" +"Last-Translator: Vasilis Kosmidis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Αγαπημένα" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Η λειτουργία δεν υποστηρίζεται" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/en_GB.po b/po/en_GB.po index 26cb21a..694765c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2019-11-22 18:23+0000\n" +"PO-Revision-Date: 2021-01-05 15:11+0000\n" "Last-Translator: Stephan Woidowski \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Favourites" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Operation not supported" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/eo.po b/po/eo.po index ce8230f..acc1a6b 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-04-16 13:30+0000\n" +"PO-Revision-Date: 2021-04-24 18:10+0000\n" "Last-Translator: Piet Coppens \n" "Language-Team: Esperanto \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Plej ŝatataj" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Operacio ne subtenata" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/es.po b/po/es.po index 9c25cc7..b5bb750 100644 --- a/po/es.po +++ b/po/es.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/et.po b/po/et.po index c60f8ef..6381f2e 100644 --- a/po/et.po +++ b/po/et.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/eu.po b/po/eu.po index 3079289..282f843 100644 --- a/po/eu.po +++ b/po/eu.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/fi.po b/po/fi.po index 5222cb8..6406c3f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/fr.po b/po/fr.po index eaccb3d..ac70539 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/fr_CA.po b/po/fr_CA.po index be11d14..7769d16 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/he.po b/po/he.po index 1203b54..be1b67a 100644 --- a/po/he.po +++ b/po/he.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-03-02 19:49+0000\n" -"Last-Translator: Rony Alaluf \n" +"PO-Revision-Date: 2021-06-15 14:14+0000\n" +"Last-Translator: Avi Markovitz \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "מועדפים" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,17 +28,17 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "הפעולה לא נתמכת" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 msgid "Icon size" -msgstr "גודל סמלים" +msgstr "גודל סמל" #: libxapp/xapp-icon-chooser-button.c:208 #: libxapp/xapp-icon-chooser-dialog.c:640 msgid "The preferred icon size." -msgstr "גודל הסמלים המועדף." +msgstr "גודל הסמל המועדף." #: libxapp/xapp-icon-chooser-button.c:222 msgid "Icon" @@ -50,11 +50,11 @@ #: libxapp/xapp-icon-chooser-button.c:234 msgid "Category" -msgstr "קטגורייה" +msgstr "סוג־אב" #: libxapp/xapp-icon-chooser-button.c:235 msgid "The default category." -msgstr "קטגוריית ברירת המחדל." +msgstr "סוג־אב ברירת המחדל." #: libxapp/xapp-icon-chooser-dialog.c:98 msgid "Actions" @@ -62,19 +62,19 @@ #: libxapp/xapp-icon-chooser-dialog.c:101 msgid "Applications" -msgstr "אפליקציות" +msgstr "יישומים" #: libxapp/xapp-icon-chooser-dialog.c:104 msgid "Categories" -msgstr "קטגוריות" +msgstr "סוגי-אב" #: libxapp/xapp-icon-chooser-dialog.c:107 msgid "Devices" -msgstr "מכשירים" +msgstr "התקנים" #: libxapp/xapp-icon-chooser-dialog.c:110 msgid "Emblems" -msgstr "סמלונים" +msgstr "סמלים" #: libxapp/xapp-icon-chooser-dialog.c:113 msgid "Emoji" @@ -86,7 +86,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:119 msgid "Places" -msgstr "מיקומים" +msgstr "מקומות" #: libxapp/xapp-icon-chooser-dialog.c:122 msgid "Status" @@ -98,19 +98,19 @@ #: libxapp/xapp-icon-chooser-dialog.c:454 msgid "Choose an icon" -msgstr "בחר סמל" +msgstr "בחירת סמל" #: libxapp/xapp-icon-chooser-dialog.c:476 msgid "Search" -msgstr "חפש" +msgstr "חיפוש" #: libxapp/xapp-icon-chooser-dialog.c:483 msgid "Browse" -msgstr "סייר" +msgstr "דפדוף" #: libxapp/xapp-icon-chooser-dialog.c:539 msgid "Loading..." -msgstr "טוען..." +msgstr "טעינה…" #: libxapp/xapp-icon-chooser-dialog.c:586 msgid "Default" @@ -118,16 +118,16 @@ #: libxapp/xapp-icon-chooser-dialog.c:596 msgid "Select" -msgstr "בחר" +msgstr "בחירה" #: libxapp/xapp-icon-chooser-dialog.c:605 #: libxapp/xapp-icon-chooser-dialog.c:1936 msgid "Cancel" -msgstr "בטל" +msgstr "ביטול" #: libxapp/xapp-icon-chooser-dialog.c:652 msgid "Allow Paths" -msgstr "הרשה נתיבים" +msgstr "אפשור נתיבים" #: libxapp/xapp-icon-chooser-dialog.c:653 msgid "Whether to allow paths." @@ -139,15 +139,15 @@ #: libxapp/xapp-icon-chooser-dialog.c:665 msgid "The icon to use by default" -msgstr "סמל ברירת מחדל לשימוש" +msgstr "סמל לשימוש כברירת מחדל" #: libxapp/xapp-icon-chooser-dialog.c:1933 msgid "Select image file" -msgstr "בחר קובץ תמונה" +msgstr "בחירת קובץ תמונה" #: libxapp/xapp-icon-chooser-dialog.c:1938 msgid "Open" -msgstr "פתח" +msgstr "פתיחה" #: libxapp/xapp-icon-chooser-dialog.c:1953 msgid "Image" @@ -161,7 +161,7 @@ #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:7 #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:11 msgid "Area where XApp status icons appear" -msgstr "אזור שבו יופיעו סמלי מצב של XApp" +msgstr "אזור שבו יופיעו סמלי מצב XApp" #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:6 msgid "XApp Status Applet Factory" diff --git a/po/hi.po b/po/hi.po index d492cb7..b052326 100644 --- a/po/hi.po +++ b/po/hi.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/hr.po b/po/hr.po index a549f50..89d5958 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/hu.po b/po/hu.po index b3c2481..057a1d7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,8 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" "Language: hu\n" #: libxapp/favorite-vfs-file.c:463 diff --git a/po/ia.po b/po/ia.po index 3adc18e..1e84f5b 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-08-02 07:18+0000\n" +"PO-Revision-Date: 2021-06-25 04:45+0000\n" "Last-Translator: karm \n" "Language-Team: Interlingua \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Favoritos" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Operation non supportate" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 @@ -161,11 +161,11 @@ #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:7 #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:11 msgid "Area where XApp status icons appear" -msgstr "" +msgstr "Area ubi appare le icone de stato de XApp" #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:6 msgid "XApp Status Applet Factory" -msgstr "" +msgstr "Fabrica de applet XApp Status" #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:10 msgid "XApp Status Applet" diff --git a/po/id.po b/po/id.po index 13a9d83..c654193 100644 --- a/po/id.po +++ b/po/id.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-03-29 07:51+0000\n" +"PO-Revision-Date: 2021-05-07 03:23+0000\n" "Last-Translator: Arief Setiadi Wibowo \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Favorit" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Operasi tak didukung" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/ie.po b/po/ie.po index d56f10c..8ac467f 100644 --- a/po/ie.po +++ b/po/ie.po @@ -8,19 +8,19 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2019-05-07 11:39+0000\n" +"PO-Revision-Date: 2021-01-04 21:21+0000\n" "Last-Translator: Silvara \n" "Language-Team: Interlingue \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" "Language: ie\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Li preferet" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -29,7 +29,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Li operation es ínsupportat" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 @@ -51,11 +51,11 @@ #: libxapp/xapp-icon-chooser-button.c:234 msgid "Category" -msgstr "" +msgstr "Categorie" #: libxapp/xapp-icon-chooser-button.c:235 msgid "The default category." -msgstr "" +msgstr "Li predefinit categorie" #: libxapp/xapp-icon-chooser-dialog.c:98 msgid "Actions" @@ -115,7 +115,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:586 msgid "Default" -msgstr "" +msgstr "Predefinit" #: libxapp/xapp-icon-chooser-dialog.c:596 msgid "Select" @@ -136,11 +136,11 @@ #: libxapp/xapp-icon-chooser-dialog.c:664 msgid "Default Icon" -msgstr "" +msgstr "Li predefinit icone" #: libxapp/xapp-icon-chooser-dialog.c:665 msgid "The icon to use by default" -msgstr "" +msgstr "Li predefinit icone." #: libxapp/xapp-icon-chooser-dialog.c:1933 msgid "Select image file" @@ -156,7 +156,7 @@ #: status-applets/mate/mate-xapp-status-applet.py:330 msgid "About" -msgstr "" +msgstr "Pri" #: status-applets/mate/mate-xapp-status-applet.py:350 #: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:7 diff --git a/po/is.po b/po/is.po index 58ed2fd..b6a2e94 100644 --- a/po/is.po +++ b/po/is.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-02-25 07:27+0000\n" +"PO-Revision-Date: 2021-01-12 17:39+0000\n" "Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Eftirlæti" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Aðgerðin er ekki studd" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/it.po b/po/it.po index 15ef740..b02c8f9 100644 --- a/po/it.po +++ b/po/it.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ja.po b/po/ja.po index 492b87e..f4c138a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ka.po b/po/ka.po index 495a9d0..8a338be 100644 --- a/po/ka.po +++ b/po/ka.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/kab.po b/po/kab.po index 73e0e70..c7c78a4 100644 --- a/po/kab.po +++ b/po/kab.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/kk.po b/po/kk.po index 5bcc420..c462673 100644 --- a/po/kk.po +++ b/po/kk.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ko.po b/po/ko.po index 9a5ef7a..ee489bf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ku.po b/po/ku.po index 9cfc516..4f4ebda 100644 --- a/po/ku.po +++ b/po/ku.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/la.po b/po/la.po new file mode 100644 index 0000000..6fa7626 --- /dev/null +++ b/po/la.po @@ -0,0 +1,173 @@ +# Latin translation for linuxmint +# Copyright (c) 2021 Rosetta Contributors and Canonical Ltd 2021 +# This file is distributed under the same license as the linuxmint package. +# FIRST AUTHOR , 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: linuxmint\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2020-11-25 11:16+0000\n" +"PO-Revision-Date: 2021-06-10 10:19+0000\n" +"Last-Translator: Davide Novemila \n" +"Language-Team: Latin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" +"Language: la\n" + +#: libxapp/favorite-vfs-file.c:463 +msgid "Favorites" +msgstr "Praeposita" + +#: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 +#: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 +#: libxapp/favorite-vfs-file.c:1053 libxapp/favorite-vfs-file.c:1082 +#: libxapp/favorite-vfs-file.c:1115 libxapp/favorite-vfs-file.c:1142 +#: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 +#: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 +msgid "Operation not supported" +msgstr "Operatio non tolerata" + +#: libxapp/xapp-icon-chooser-button.c:207 +#: libxapp/xapp-icon-chooser-dialog.c:639 +msgid "Icon size" +msgstr "Amplitudo iconum" + +#: libxapp/xapp-icon-chooser-button.c:208 +#: libxapp/xapp-icon-chooser-dialog.c:640 +msgid "The preferred icon size." +msgstr "Praeposita amplitudo iconum." + +#: libxapp/xapp-icon-chooser-button.c:222 +msgid "Icon" +msgstr "Icon" + +#: libxapp/xapp-icon-chooser-button.c:223 +msgid "The string representing the icon." +msgstr "Stringa iconem figurans." + +#: libxapp/xapp-icon-chooser-button.c:234 +msgid "Category" +msgstr "Genus" + +#: libxapp/xapp-icon-chooser-button.c:235 +msgid "The default category." +msgstr "Genus praedesignatum." + +#: libxapp/xapp-icon-chooser-dialog.c:98 +msgid "Actions" +msgstr "Actiones" + +#: libxapp/xapp-icon-chooser-dialog.c:101 +msgid "Applications" +msgstr "Applicationes" + +#: libxapp/xapp-icon-chooser-dialog.c:104 +msgid "Categories" +msgstr "Genera" + +#: libxapp/xapp-icon-chooser-dialog.c:107 +msgid "Devices" +msgstr "Apparatus" + +#: libxapp/xapp-icon-chooser-dialog.c:110 +msgid "Emblems" +msgstr "Emblemata" + +#: libxapp/xapp-icon-chooser-dialog.c:113 +msgid "Emoji" +msgstr "Emotica" + +#: libxapp/xapp-icon-chooser-dialog.c:116 +msgid "Mime types" +msgstr "Mime typi" + +#: libxapp/xapp-icon-chooser-dialog.c:119 +msgid "Places" +msgstr "Loci" + +#: libxapp/xapp-icon-chooser-dialog.c:122 +msgid "Status" +msgstr "Status" + +#: libxapp/xapp-icon-chooser-dialog.c:125 +msgid "Other" +msgstr "Alia" + +#: libxapp/xapp-icon-chooser-dialog.c:454 +msgid "Choose an icon" +msgstr "Iconem elige" + +#: libxapp/xapp-icon-chooser-dialog.c:476 +msgid "Search" +msgstr "Quaere" + +#: libxapp/xapp-icon-chooser-dialog.c:483 +msgid "Browse" +msgstr "Naviga" + +#: libxapp/xapp-icon-chooser-dialog.c:539 +msgid "Loading..." +msgstr "Legitur ..." + +#: libxapp/xapp-icon-chooser-dialog.c:586 +msgid "Default" +msgstr "Praedesignata" + +#: libxapp/xapp-icon-chooser-dialog.c:596 +msgid "Select" +msgstr "Elige" + +#: libxapp/xapp-icon-chooser-dialog.c:605 +#: libxapp/xapp-icon-chooser-dialog.c:1936 +msgid "Cancel" +msgstr "Interrumpe" + +#: libxapp/xapp-icon-chooser-dialog.c:652 +msgid "Allow Paths" +msgstr "Itinera Permitte" + +#: libxapp/xapp-icon-chooser-dialog.c:653 +msgid "Whether to allow paths." +msgstr "Si itinera permittuntur." + +#: libxapp/xapp-icon-chooser-dialog.c:664 +msgid "Default Icon" +msgstr "Icon praedesignata" + +#: libxapp/xapp-icon-chooser-dialog.c:665 +msgid "The icon to use by default" +msgstr "Icon si alia non electa" + +#: libxapp/xapp-icon-chooser-dialog.c:1933 +msgid "Select image file" +msgstr "Plica imaginis elige" + +#: libxapp/xapp-icon-chooser-dialog.c:1938 +msgid "Open" +msgstr "Aperi" + +#: libxapp/xapp-icon-chooser-dialog.c:1953 +msgid "Image" +msgstr "Imago" + +#: status-applets/mate/mate-xapp-status-applet.py:330 +msgid "About" +msgstr "Circa" + +#: status-applets/mate/mate-xapp-status-applet.py:350 +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:7 +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:11 +msgid "Area where XApp status icons appear" +msgstr "Area ubi XApp icon status apparet" + +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:6 +msgid "XApp Status Applet Factory" +msgstr "Miniapplicationis XApp Status Officina" + +#: status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in:10 +msgid "XApp Status Applet" +msgstr "Miniapplicatio XApp Status" diff --git a/po/lt.po b/po/lt.po index f501450..eeceea2 100644 --- a/po/lt.po +++ b/po/lt.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/mai.po b/po/mai.po index d8cc835..1b9c6d4 100644 --- a/po/mai.po +++ b/po/mai.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ms.po b/po/ms.po index 2087004..f1b7e63 100644 --- a/po/ms.po +++ b/po/ms.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/nl.po b/po/nl.po index 5e5be1f..510f79a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/oc.po b/po/oc.po index ac687e1..e5507ae 100644 --- a/po/oc.po +++ b/po/oc.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/pl.po b/po/pl.po index b7f9677..7028134 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/pt.po b/po/pt.po index eb01bdb..7a2f58e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7278126..8bd5b70 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ro.po b/po/ro.po index 34d74c7..740f446 100644 --- a/po/ro.po +++ b/po/ro.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/ru.po b/po/ru.po index f1e3c45..67de130 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,18 +8,18 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2019-11-26 11:58+0000\n" -"Last-Translator: Saveliy Daurcev \n" +"PO-Revision-Date: 2021-01-10 06:20+0000\n" +"Last-Translator: Aleksey Kabanov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" -msgstr "" +msgstr "Избранное" #: libxapp/favorite-vfs-file.c:933 libxapp/favorite-vfs-file.c:963 #: libxapp/favorite-vfs-file.c:992 libxapp/favorite-vfs-file.c:1026 @@ -28,7 +28,7 @@ #: libxapp/favorite-vfs-file.c:1204 libxapp/favorite-vfs-file.c:1239 #: libxapp/favorite-vfs-file.c:1269 libxapp/favorite-vfs-file.c:1308 msgid "Operation not supported" -msgstr "" +msgstr "Действие не поддерживается" #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 diff --git a/po/sk.po b/po/sk.po index d0ec8b4..d7c868c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" "Language: sk\n" #: libxapp/favorite-vfs-file.c:463 diff --git a/po/sl.po b/po/sl.po index ba97cc6..6e23d74 100644 --- a/po/sl.po +++ b/po/sl.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/sr.po b/po/sr.po index 92070a0..ccb963b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" "Language: sr\n" #: libxapp/favorite-vfs-file.c:463 diff --git a/po/sr@latin.po b/po/sr@latin.po index d098f62..8bc7716 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/sv.po b/po/sv.po index 43eb8de..e69b3e0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/tr.po b/po/tr.po index 8a4fe82..f9737c7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/uk.po b/po/uk.po index 5a54c45..9d28e8e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,14 +8,14 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-11-27 06:40+0000\n" +"PO-Revision-Date: 2021-05-15 08:00+0000\n" "Last-Translator: Mykola Tkach \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" @@ -98,7 +98,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:454 msgid "Choose an icon" -msgstr "Виберіть піктограму" +msgstr "Оберіть піктограму" #: libxapp/xapp-icon-chooser-dialog.c:476 msgid "Search" @@ -118,7 +118,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:596 msgid "Select" -msgstr "Вибрати" +msgstr "Обрати" #: libxapp/xapp-icon-chooser-dialog.c:605 #: libxapp/xapp-icon-chooser-dialog.c:1936 @@ -143,7 +143,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:1933 msgid "Select image file" -msgstr "Вибрати файл зображення" +msgstr "Обрати файл зображення" #: libxapp/xapp-icon-chooser-dialog.c:1938 msgid "Open" diff --git a/po/uz.po b/po/uz.po index 576ed03..85986be 100644 --- a/po/uz.po +++ b/po/uz.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/zgh.po b/po/zgh.po index 513633b..acf99fc 100644 --- a/po/zgh.po +++ b/po/zgh.po @@ -8,14 +8,14 @@ "Project-Id-Version: linuxmint\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2020-11-25 11:16+0000\n" -"PO-Revision-Date: 2020-10-20 05:41+0000\n" +"PO-Revision-Date: 2021-05-01 07:05+0000\n" "Last-Translator: Hakim Oubouali \n" "Language-Team: Standard Moroccan Tamazight \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" @@ -33,7 +33,7 @@ #: libxapp/xapp-icon-chooser-button.c:207 #: libxapp/xapp-icon-chooser-dialog.c:639 msgid "Icon size" -msgstr "" +msgstr "ⵜⵉⵖⵣⵉ ⵏ ⵜⴳⵏⵉⵜ" #: libxapp/xapp-icon-chooser-button.c:208 #: libxapp/xapp-icon-chooser-dialog.c:640 @@ -42,7 +42,7 @@ #: libxapp/xapp-icon-chooser-button.c:222 msgid "Icon" -msgstr "" +msgstr "ⵜⵉⴳⵏⵉⵜ" #: libxapp/xapp-icon-chooser-button.c:223 msgid "The string representing the icon." @@ -151,7 +151,7 @@ #: libxapp/xapp-icon-chooser-dialog.c:1953 msgid "Image" -msgstr "" +msgstr "ⵜⴰⵡⵍⴰⴼⵜ" #: status-applets/mate/mate-xapp-status-applet.py:330 msgid "About" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8915e90..7473e5d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/zh_HK.po b/po/zh_HK.po index 1691e81..9f57d42 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2b7e1a7..6e26459 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-01-02 14:18+0000\n" -"X-Generator: Launchpad (build 34b3ffd45c9543b7f7aa5aa313925241e9e7ca3f)\n" +"X-Launchpad-Export-Date: 2021-06-25 10:43+0000\n" +"X-Generator: Launchpad (build 40cc6dba4163ba9ca785b26ad91f43c87d70ba4d)\n" #: libxapp/favorite-vfs-file.c:463 msgid "Favorites" diff --git a/test-scripts/xapp-status-icon-variants/dialog-error.png b/test-scripts/xapp-status-icon-variants/dialog-error.png new file mode 100644 index 0000000..4ca2e68 Binary files /dev/null and b/test-scripts/xapp-status-icon-variants/dialog-error.png differ diff --git a/test-scripts/xapp-status-icon-variants/dialog-warning.png b/test-scripts/xapp-status-icon-variants/dialog-warning.png new file mode 100644 index 0000000..ef2a1bf Binary files /dev/null and b/test-scripts/xapp-status-icon-variants/dialog-warning.png differ diff --git a/test-scripts/xapp-status-icon-variants/qt-system-tray.py b/test-scripts/xapp-status-icon-variants/qt-system-tray.py new file mode 100755 index 0000000..d9e6d9c --- /dev/null +++ b/test-scripts/xapp-status-icon-variants/qt-system-tray.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 + +# install python3-pyside2.qtgui, .qtwidgets + +from PySide2.QtWidgets import QApplication, QSystemTrayIcon, QMenu, QAction +from PySide2.QtGui import QIcon, QPixmap + +class App(QApplication): + def __init__(self): + super(App, self).__init__([]) + + self.icon_type = "theme" + self.tic_toc = False + + self.setQuitOnLastWindowClosed(False) + + self.tray = QSystemTrayIcon() + self.tray.setIcon(QIcon.fromTheme("dialog-warning")) + self.tray.setVisible(True) + + self.menu = QMenu() + + entry = "Use icon name" + action = QAction(entry) + action.triggered.connect(self.use_icon_theme) + self.menu.addAction(action) + + entry = "Use icon file" + action2 = QAction(entry) + action2.triggered.connect(self.use_icon_file) + self.menu.addAction(action2) + + entry = "Use icon pixels" + action3 = QAction(entry) + action3.triggered.connect(self.use_icon_pixels) + self.menu.addAction(action3) + + entry = "Quit" + action4 = QAction(entry) + action4.triggered.connect(self.quit) + self.menu.addAction(action4) + + self.tray.setContextMenu(self.menu) + self.tray.activated.connect(self.icon_activated) + self.exec_() + + def use_icon_theme(self, item): + self.icon_type = "theme" + + def use_icon_file(self, item): + self.icon_type = "file" + + def use_icon_pixels(self, item): + self.icon_type = "pixels" + + def icon_activated(self, reason): + if self.icon_type == "theme": + icon = QIcon.fromTheme("dialog-warning" if self.tic_toc else "dialog-error") + self.tray.setIcon(icon) + self.tic_toc = not self.tic_toc + elif self.icon_type == "file": + icon = QIcon("./dialog-warning.png" if self.tic_toc else "./dialog-error.png") + self.tray.setIcon(icon) + self.tic_toc = not self.tic_toc + else: + pixmap = QPixmap("./dialog-warning.png" if self.tic_toc else "./dialog-error.png") + icon = QIcon(pixmap) + self.tray.setIcon(icon) + self.tic_toc = not self.tic_toc + +if __name__ == '__main__': + app = App() diff --git a/xapp-sn-watcher/sn-item.c b/xapp-sn-watcher/sn-item.c index 9d39b42..7d2ee76 100644 --- a/xapp-sn-watcher/sn-item.c +++ b/xapp-sn-watcher/sn-item.c @@ -16,6 +16,9 @@ #include "sn-item-interface.h" #include "sn-item.h" + +#define DEBUG_FLAG XAPP_DEBUG_SN_WATCHER +#include #define FALLBACK_ICON_SIZE 24 @@ -163,7 +166,7 @@ sn_item_dispose (GObject *object) { SnItem *item = SN_ITEM (object); - g_debug ("SnItem dispose (%p)", object); + DEBUG ("SnItem dispose (%p)", object); if (item->png_path != NULL) { @@ -196,7 +199,7 @@ static void sn_item_finalize (GObject *object) { - g_debug ("SnItem finalize (%p)", object); + DEBUG ("SnItem finalize (%p)", object); G_OBJECT_CLASS (sn_item_parent_class)->finalize (object); } @@ -376,7 +379,7 @@ cairo_surface_t *surface; gchar *filename, *save_filename; - g_debug ("Trying to use icon pixmap for %s", + DEBUG ("Trying to use icon pixmap for %s", item->sortable_name); surface = NULL; @@ -413,7 +416,7 @@ cairo_status_t status = CAIRO_STATUS_SUCCESS; status = cairo_surface_write_to_png (surface, save_filename); - g_debug ("Saving tmp image file for '%s' to '%s'", item->sortable_name, save_filename); + DEBUG ("Saving tmp image file for '%s' to '%s'", item->sortable_name, save_filename); if (status != CAIRO_STATUS_SUCCESS) { @@ -425,7 +428,7 @@ return; } - g_debug ("No pixmaps to use"); + DEBUG ("No pixmaps to use"); xapp_status_icon_set_icon_name (item->status_icon, "image-missing"); } @@ -492,7 +495,7 @@ const gchar *icon_theme_path, const gchar *icon_name) { - g_debug ("Checking for icon name for %s - theme path: '%s', icon name: '%s'", + DEBUG ("Checking for icon name for %s - theme path: '%s', icon name: '%s'", item->sortable_name, icon_theme_path, icon_name); @@ -581,7 +584,7 @@ new_props->menu_path)); g_object_ref_sink (item->menu); - g_debug ("New menu for '%s'", item->sortable_name); + DEBUG ("New menu for '%s'", item->sortable_name); if (item->is_ai && !item->should_activate) { @@ -634,7 +637,7 @@ new_props->tooltip_body); xapp_status_icon_set_tooltip_text (item->status_icon, text); - g_debug ("Tooltip text for '%s' from ToolTip: %s", + DEBUG ("Tooltip text for '%s' from ToolTip: %s", item->sortable_name, text); @@ -642,7 +645,7 @@ } else { - g_debug ("Tooltip text for '%s' from ToolTip: %s", + DEBUG ("Tooltip text for '%s' from ToolTip: %s", item->sortable_name, new_props->tooltip_heading); @@ -660,7 +663,7 @@ capped_string = capitalize (new_props->title); xapp_status_icon_set_tooltip_text (item->status_icon, capped_string); - g_debug ("Tooltip text for '%s' from Title: %s", + DEBUG ("Tooltip text for '%s' from Title: %s", item->sortable_name, capped_string); @@ -691,7 +694,7 @@ xapp_status_icon_set_visible (item->status_icon, TRUE); } - g_debug ("Status for '%s' is now '%s'", item->sortable_name, new_props->status); + DEBUG ("Status for '%s' is now '%s'", item->sortable_name, new_props->status); } static gchar * @@ -1106,7 +1109,7 @@ return; } - g_debug ("Sort name for '%s' is '%s'", + DEBUG ("Sort name for '%s' is '%s'", g_dbus_proxy_get_name (G_DBUS_PROXY (item->sn_item_proxy)), sortable_name); diff --git a/xapp-sn-watcher/xapp-sn-watcher.c b/xapp-sn-watcher/xapp-sn-watcher.c index 2983b05..bd06679 100644 --- a/xapp-sn-watcher/xapp-sn-watcher.c +++ b/xapp-sn-watcher/xapp-sn-watcher.c @@ -4,12 +4,17 @@ #include #include + +#define DEBUG_FLAG XAPP_DEBUG_SN_WATCHER +#include + #include #include "sn-watcher-interface.h" #include "sn-item-interface.h" #include "sn-item.h" + #define XAPP_TYPE_SN_WATCHER xapp_sn_watcher_get_type () G_DECLARE_FINAL_TYPE (XAppSnWatcher, xapp_sn_watcher, XAPP, SN_WATCHER, GtkApplication) @@ -56,7 +61,7 @@ { if (watcher->shutdown_pending) { - g_debug ("A monitor appeared on the bus, cancelling shutdown\n"); + DEBUG ("A monitor appeared on the bus, cancelling shutdown\n"); watcher->shutdown_pending = FALSE; g_application_hold (G_APPLICATION (watcher)); @@ -92,7 +97,7 @@ if (g_str_has_prefix (key, name)) { - g_debug ("Client %s has exited, removing status icon", key); + DEBUG ("Client %s has exited, removing status icon", key); g_hash_table_remove (watcher->items, key); update_published_items (watcher); @@ -110,17 +115,17 @@ { if (g_str_has_prefix (name, STATUS_ICON_MONITOR_PREFIX)) { - g_debug ("Lost a monitor, checking for any more"); + DEBUG ("Lost a monitor, checking for any more"); if (xapp_status_icon_any_monitors ()) { - g_debug ("Still have a monitor, continuing"); + DEBUG ("Still have a monitor, continuing"); return; } else { - g_debug ("Lost our last monitor, starting countdown\n"); + DEBUG ("Lost our last monitor, starting countdown\n"); if (!watcher->shutdown_pending) { @@ -154,7 +159,7 @@ g_variant_get (parameters, "(&s&s&s)", &name, &old_owner, &new_owner); - g_debug("XAppSnWatcher: NameOwnerChanged signal received (n: %s, old: %s, new: %s", name, old_owner, new_owner); + DEBUG("NameOwnerChanged signal received (n: %s, old: %s, new: %s", name, old_owner, new_owner); if (!name) { @@ -174,7 +179,7 @@ static void add_name_listener (XAppSnWatcher *watcher) { - g_debug ("XAppSnWatcher: Adding NameOwnerChanged listener for status monitor existence"); + DEBUG ("Adding NameOwnerChanged listener for status monitor existence"); watcher->name_listener_id = g_dbus_connection_signal_subscribe (watcher->connection, FDO_DBUS_NAME, @@ -195,7 +200,7 @@ { XAppSnWatcher *watcher = XAPP_SN_WATCHER (user_data); - g_debug ("Lost StatusNotifierWatcher name (maybe something replaced us), exiting immediately"); + DEBUG ("Lost StatusNotifierWatcher name (maybe something replaced us), exiting immediately"); g_application_quit (G_APPLICATION (watcher)); } @@ -206,7 +211,7 @@ { XAppSnWatcher *watcher = XAPP_SN_WATCHER (user_data); - g_debug ("Name acquired on dbus"); + DEBUG ("Name acquired on dbus"); sn_watcher_interface_set_protocol_version (watcher->skeleton, 0); sn_watcher_interface_set_is_status_notifier_host_registered (watcher->skeleton, watcher->advertise_host); @@ -289,7 +294,7 @@ temp_key = g_strdup_printf ("%s%s", temp_bname, temp_path); - g_debug ("Key: '%s', busname '%s', path '%s'", temp_key, temp_bname, temp_path); + DEBUG ("Key: '%s', busname '%s', path '%s'", temp_key, temp_bname, temp_path); *key = temp_key; *bus_name = temp_bname; @@ -357,7 +362,7 @@ { if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_debug ("Could not create new status notifier proxy item for item at %s: %s", + DEBUG ("Could not create new status notifier proxy item for item at %s: %s", data->bus_name, error->message); } @@ -412,7 +417,7 @@ { NewSnProxyData *data; error = NULL; - // g_debug ("Key: '%s'", key); + // DEBUG ("Key: '%s'", key); data = g_slice_new0 (NewSnProxyData); data->watcher = watcher; @@ -456,7 +461,7 @@ watcher->skeleton = sn_watcher_interface_skeleton_new (); - g_debug ("XAppSnWatcher: exporting StatusNotifierWatcher dbus interface to %s", NOTIFICATION_WATCHER_PATH); + DEBUG ("Exporting StatusNotifierWatcher dbus interface to %s", NOTIFICATION_WATCHER_PATH); g_signal_connect (watcher->skeleton, "handle-register-status-notifier-item", @@ -486,7 +491,7 @@ static gboolean on_interrupt (XAppSnWatcher *watcher) { - g_debug ("SIGINT - shutting down immediately"); + DEBUG ("SIGINT - shutting down immediately"); g_application_quit (G_APPLICATION (watcher)); return FALSE; @@ -495,7 +500,7 @@ static void continue_startup (XAppSnWatcher *watcher) { - g_debug ("Trying to acquire session bus connection"); + DEBUG ("Trying to acquire session bus connection"); g_unix_signal_add (SIGINT, (GSourceFunc) on_interrupt, watcher); g_application_hold (G_APPLICATION (watcher)); @@ -573,7 +578,7 @@ } else { - g_debug ("No active monitors, exiting in 30s"); + DEBUG ("No active monitors, exiting in 30s"); watcher->shutdown_pending = TRUE; } } @@ -702,7 +707,7 @@ if (!should_start) { - g_debug ("XDG_CURRENT_DESKTOP is '%s' - not starting XApp's StatusNotifierWatcher service." + DEBUG ("XDG_CURRENT_DESKTOP is '%s' - not starting XApp's StatusNotifierWatcher service." "If you want to change this, add your desktop's name to the dconf org.x.apps.statusicon " "'status-notifier-enabled-desktops' setting key.", current_desktop); exit(0);