[Xfce4-commits] xfce4-appfinder:master l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/master to fed9f4b961dd88ebaf0203a658d4a93c713b7280 (commit) from 8f01b1b65d3006023bfc06061e5f2cd5955630d4 (commit) commit fed9f4b961dd88ebaf0203a658d4a93c713b7280 Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Mar 3 10:31:03 2012 +0100 l10n: Updated Indonesian (id) translation to 100% New status: 67 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index 89ca582..839e515 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-appfinder 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-25 10:57+\n +POT-Creation-Date: 2012-03-03 06:45+\n PO-Revision-Date: 2009-01-27 22:28+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian i...@li.org\n @@ -215,10 +215,13 @@ msgstr #: ../src/appfinder-preferences.glade.h:14 msgid -Instead of quiting the application when the last window is closed, keep a +Instead of quitting the application when the last window is closed, keep a running instance to speed up opening new windows. You might want to disable this to reduce memory usage. -msgstr Ketimbang menutup aplikasi ketika jendela terakhir ditutup, simpan instansi berjalan untuk mempercepat ketika membuka jendela baru. Anda mungkin ingin menonaktifkan ini untuk mengurangi penggunaan memori. +msgstr +Ketimbang menutup aplikasi ketika jendela terakhir ditutup, simpan instansi +berjalan untuk mempercepat ketika membuka jendela baru. Anda mungkin ingin +menonaktifkan ini untuk mengurangi penggunaan memori. #: ../src/appfinder-preferences.glade.h:15 msgid Ite_m icon size: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Replace popup with infobar
Updating branch refs/heads/master to 750e20e65bdd0cdaade74bc94f07b9b260f9008a (commit) from 859c31ae8f52070e8df9888a2b1a124b23ad5ccb (commit) commit 750e20e65bdd0cdaade74bc94f07b9b260f9008a Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 10:51:06 2012 +0100 Replace popup with infobar Conflicts: src/settings.c src/image_viewer.c | 52 ++-- src/main_window.c | 17 + src/settings.c | 29 - 3 files changed, 23 insertions(+), 75 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 65fc28e..dfc1166 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -75,7 +75,6 @@ struct _RsttoImageViewerPriv GdkColor*bg_color_fs; GError *error; -gboolean show_broken_image_error; RsttoImageViewerTransaction *transaction; GdkPixbuf *pixbuf; @@ -289,11 +288,6 @@ rstto_image_viewer_init ( GObject *object ) viewer-priv-visual = gdk_rgb_get_visual(); viewer-priv-colormap = gdk_colormap_new (viewer-priv-visual, TRUE); -viewer-priv-show_broken_image_error = -rstto_settings_get_boolean_property ( -viewer-priv-settings, -show-error-broken-image); - viewer-priv-icon_theme = gtk_icon_theme_get_default (); viewer-priv-bg_icon = gtk_icon_theme_load_icon ( viewer-priv-icon_theme, @@ -1433,9 +1427,9 @@ rstto_image_viewer_set_file ( g_error_free (viewer-priv-error); viewer-priv-error = NULL; } -viewer-priv-image_scale = 0; -viewer-priv-image_width = 0; -viewer-priv-image_height = 0; +viewer-priv-image_scale = 1.0; +viewer-priv-image_width = 1.0; +viewer-priv-image_height = 1.0; rstto_image_viewer_load_image ( viewer, @@ -1923,7 +1917,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti { RsttoImageViewer *viewer = transaction-viewer; GtkWidget *widget = GTK_WIDGET(viewer); -GtkWidget *error_dialog = NULL; GtkWidget *vbox, *do_not_show_checkbox; if (viewer-priv-transaction == transaction) @@ -1940,6 +1933,9 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti } else { +viewer-priv-image_scale = 1.0; +viewer-priv-image_width = 1.0; +viewer-priv-image_height = 1.0; if (viewer-priv-pixbuf) { g_object_unref (viewer-priv-pixbuf); @@ -1947,42 +1943,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti } gtk_widget_set_tooltip_text (GTK_WIDGET (viewer), transaction-error-message); -if (viewer-priv-show_broken_image_error) -{ -GDK_THREADS_ENTER(); -error_dialog = gtk_message_dialog_new_with_markup ( -NULL, -0, -GTK_MESSAGE_WARNING, -GTK_BUTTONS_OK, -transaction-error-message -); -vbox = gtk_message_dialog_get_message_area ( - GTK_MESSAGE_DIALOG (error_dialog)); - -do_not_show_checkbox = gtk_check_button_new_with_mnemonic ( -_(Do _not show this message again)); -gtk_box_pack_end ( -GTK_BOX (vbox), -do_not_show_checkbox, -TRUE, -FALSE, -0); -gtk_widget_show (do_not_show_checkbox); -gtk_dialog_run (GTK_DIALOG(error_dialog)); - -if (TRUE == gtk_toggle_button_get_active ( -GTK_TOGGLE_BUTTON (do_not_show_checkbox))) -{ -viewer-priv-show_broken_image_error = FALSE; -rstto_settings_set_boolean_property ( -viewer-priv-settings, -show-error-broken-image, -FALSE); -} -gtk_widget_destroy (error_dialog); -GDK_THREADS_LEAVE(); -} } diff --git a/src/main_window.c b/src/main_window.c index 8a5bd78..936f3cd 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -83,6 +83,8 @@ struct _RsttoMainWindowPriv GtkWidget *menubar; GtkWidget *toolbar; +GtkWidget *warning; +GtkWidget *warning_label; GtkWidget *image_list_toolbar; GtkWidget *image_viewer_menu; GtkWidget *position_menu; @@ -617,6 +619,16 @@ rstto_main_window_init
[Xfce4-commits] ristretto:ristretto-0.3 Replace popup with infobar
Updating branch refs/heads/ristretto-0.3 to 161a676aff908a6bcf1397442cfa2f7e043a2266 (commit) from 0462262d167566209cfdb8d2cfb5e4452d9c9d77 (commit) commit 161a676aff908a6bcf1397442cfa2f7e043a2266 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 10:51:06 2012 +0100 Replace popup with infobar src/image_viewer.c | 52 ++-- src/main_window.c | 17 + src/settings.c | 29 - 3 files changed, 23 insertions(+), 75 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 14b6780..08a0f64 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -75,7 +75,6 @@ struct _RsttoImageViewerPriv GdkColor*bg_color_fs; GError *error; -gboolean show_broken_image_error; RsttoImageViewerTransaction *transaction; GdkPixbuf *pixbuf; @@ -289,11 +288,6 @@ rstto_image_viewer_init ( GObject *object ) viewer-priv-visual = gdk_rgb_get_visual(); viewer-priv-colormap = gdk_colormap_new (viewer-priv-visual, TRUE); -viewer-priv-show_broken_image_error = -rstto_settings_get_boolean_property ( -viewer-priv-settings, -show-error-broken-image); - viewer-priv-icon_theme = gtk_icon_theme_get_default (); viewer-priv-bg_icon = gtk_icon_theme_load_icon ( viewer-priv-icon_theme, @@ -1433,9 +1427,9 @@ rstto_image_viewer_set_file ( g_error_free (viewer-priv-error); viewer-priv-error = NULL; } -viewer-priv-image_scale = 0; -viewer-priv-image_width = 0; -viewer-priv-image_height = 0; +viewer-priv-image_scale = 1.0; +viewer-priv-image_width = 1.0; +viewer-priv-image_height = 1.0; rstto_image_viewer_load_image ( viewer, @@ -1923,7 +1917,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti { RsttoImageViewer *viewer = transaction-viewer; GtkWidget *widget = GTK_WIDGET(viewer); -GtkWidget *error_dialog = NULL; GtkWidget *vbox, *do_not_show_checkbox; if (viewer-priv-transaction == transaction) @@ -1940,6 +1933,9 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti } else { +viewer-priv-image_scale = 1.0; +viewer-priv-image_width = 1.0; +viewer-priv-image_height = 1.0; if (viewer-priv-pixbuf) { g_object_unref (viewer-priv-pixbuf); @@ -1947,42 +1943,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti } gtk_widget_set_tooltip_text (GTK_WIDGET (viewer), transaction-error-message); -if (viewer-priv-show_broken_image_error) -{ -GDK_THREADS_ENTER(); -error_dialog = gtk_message_dialog_new_with_markup ( -NULL, -0, -GTK_MESSAGE_WARNING, -GTK_BUTTONS_OK, -transaction-error-message -); -vbox = gtk_message_dialog_get_message_area ( - GTK_MESSAGE_DIALOG (error_dialog)); - -do_not_show_checkbox = gtk_check_button_new_with_mnemonic ( -_(Do _not show this message again)); -gtk_box_pack_end ( -GTK_BOX (vbox), -do_not_show_checkbox, -TRUE, -FALSE, -0); -gtk_widget_show (do_not_show_checkbox); -gtk_dialog_run (GTK_DIALOG(error_dialog)); - -if (TRUE == gtk_toggle_button_get_active ( -GTK_TOGGLE_BUTTON (do_not_show_checkbox))) -{ -viewer-priv-show_broken_image_error = FALSE; -rstto_settings_set_boolean_property ( -viewer-priv-settings, -show-error-broken-image, -FALSE); -} -gtk_widget_destroy (error_dialog); -GDK_THREADS_LEAVE(); -} } diff --git a/src/main_window.c b/src/main_window.c index ded829a..2291f03 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -85,6 +85,8 @@ struct _RsttoMainWindowPriv GtkWidget *menubar; GtkWidget *toolbar; +GtkWidget *warning; +GtkWidget *warning_label; GtkWidget *image_list_toolbar; GtkWidget *image_viewer_menu; GtkWidget *position_menu; @@ -582,6 +584,16 @@ rstto_main_window_init (RsttoMainWindow *window)
[Xfce4-commits] ristretto:master Resolve compile-errors
Updating branch refs/heads/master to 96754ea5b1976bc181af9521f79b235f36f6fb6e (commit) from 750e20e65bdd0cdaade74bc94f07b9b260f9008a (commit) commit 96754ea5b1976bc181af9521f79b235f36f6fb6e Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 11:38:16 2012 +0100 Resolve compile-errors src/file.c | 11 +++ src/icon_bar.c | 14 -- src/image_list.c |6 -- src/image_viewer.c |1 - src/main_window.c |5 ++--- src/util.h | 26 +- 6 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/file.c b/src/file.c index 4cc68ad..e840c53 100644 --- a/src/file.c +++ b/src/file.c @@ -30,6 +30,17 @@ #include file.h #include thumbnailer.h +static uint rstto_thumbnail_size[] = +{ +THUMBNAIL_SIZE_VERY_SMALL_SIZE, +THUMBNAIL_SIZE_SMALLER_SIZE, +THUMBNAIL_SIZE_SMALL_SIZE, +THUMBNAIL_SIZE_NORMAL_SIZE, +THUMBNAIL_SIZE_LARGE_SIZE, +THUMBNAIL_SIZE_LARGER_SIZE, +THUMBNAIL_SIZE_VERY_LARGE_SIZE +}; + static void rstto_file_init (GObject *); static void diff --git a/src/icon_bar.c b/src/icon_bar.c index ae5a2c9..e69572d 100644 --- a/src/icon_bar.c +++ b/src/icon_bar.c @@ -181,11 +181,6 @@ rstto_icon_bar_calculate_item_size ( RsttoIconBar *icon_bar, RsttoIconBarItem *item); -static GdkPixbuf * -rstto_icon_bar_get_item_icon ( -RsttoIconBar *icon_bar, -RsttoIconBarItem *item); - static void rstto_icon_bar_adjustment_changed ( RsttoIconBar *icon_bar, @@ -779,7 +774,6 @@ rstto_icon_bar_size_allocate ( RsttoIconBar *icon_bar = RSTTO_ICON_BAR (widget); gdouble value = 0.0; gdouble page_size = 0.0; -gdouble scale = 0.0; widget-allocation = *allocation; @@ -971,7 +965,6 @@ rstto_icon_bar_motion ( { RsttoIconBarItem *item; RsttoIconBar *icon_bar = RSTTO_ICON_BAR (widget); -GtkTreePath *path; GtkTreeIter iter; RsttoFile*file; @@ -1235,14 +1228,12 @@ rstto_icon_bar_paint_item ( const GdkPixbuf *pixbuf = NULL; GdkColor*border_color; GdkColor*fill_color; -GdkColor*text_color; GdkGC *gc; gint focus_width; gint focus_pad; gint x, y; gint px, py; gint pixbuf_height, pixbuf_width; -const gchar *thumbnail_path; RsttoFile *file; GtkTreeIter iter; @@ -1387,7 +1378,6 @@ rstto_icon_bar_calculate_item_size ( RsttoIconBar *icon_bar, RsttoIconBarItem *item) { -GdkPixbuf *pixbuf; gint focus_width; gint focus_pad; gint int_pad; @@ -1424,6 +1414,8 @@ rstto_icon_bar_calculate_item_size ( case THUMBNAIL_SIZE_VERY_LARGE: item-width = (2 * (int_pad + focus_width + focus_pad)) + THUMBNAIL_SIZE_VERY_LARGE_SIZE; break; +default: +break; } item-height = item-width; @@ -,6 +2214,8 @@ rstto_icon_bar_update_missing_icon (RsttoIconBar *icon_bar) 0, NULL); break; +default: +break; } } diff --git a/src/image_list.c b/src/image_list.c index 021fef3..63d2b8a 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -194,11 +194,6 @@ enum RSTTO_IMAGE_LIST_ITER_SIGNAL_COUNT }; -/* Missing image thumbnail, should be re-generated every time - * the thumbnail-size changed. - */ -static GdkPixbuf *thumbnail_missing = NULL; - struct _RsttoImageListIterPriv { RsttoImageList *image_list; @@ -1436,7 +1431,6 @@ image_list_model_get_value ( gint column, GValue *value ) { -RsttoImageList *image_list = RSTTO_IMAGE_LIST (tree_model); RsttoFile *file = RSTTO_FILE(iter-user_data); switch (column) diff --git a/src/image_viewer.c b/src/image_viewer.c index dfc1166..86bbfff 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1917,7 +1917,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti { RsttoImageViewer *viewer = transaction-viewer; GtkWidget *widget = GTK_WIDGET(viewer); -GtkWidget *vbox, *do_not_show_checkbox; if (viewer-priv-transaction == transaction) { diff --git a/src/main_window.c b/src/main_window.c index 936f3cd..e42e2d6 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -470,6 +470,7 @@ rstto_main_window_init (RsttoMainWindow *window) GtkRecentFilter *recent_filter; guintwindow_width, window_height; gchar *desktop_type = NULL; +GtkWidget *info_bar_content_area; GClosure*toggle_fullscreen_closure = g_cclosure_new ((GCallback)cb_rstto_main_window_fullscreen, window, NULL); GClosure*leave_fullscreen_closure = g_cclosure_new_swap ((GCallback)gtk_window_unfullscreen, window, NULL); @@ -622,7 +623,7 @@
[Xfce4-commits] ristretto:ristretto-0.3 Resolve compiler warnings
Updating branch refs/heads/ristretto-0.3 to 7745cc7fb2a1cb074b10537e964d7bdb6eaa53ed (commit) from 161a676aff908a6bcf1397442cfa2f7e043a2266 (commit) commit 7745cc7fb2a1cb074b10537e964d7bdb6eaa53ed Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 11:39:47 2012 +0100 Resolve compiler warnings src/image_viewer.c |1 - src/main_window.c |4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 08a0f64..7e5baf0 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1917,7 +1917,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti { RsttoImageViewer *viewer = transaction-viewer; GtkWidget *widget = GTK_WIDGET(viewer); -GtkWidget *vbox, *do_not_show_checkbox; if (viewer-priv-transaction == transaction) { diff --git a/src/main_window.c b/src/main_window.c index 2291f03..bdbb2f1 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -438,6 +438,8 @@ rstto_main_window_init (RsttoMainWindow *window) GtkRecentFilter *recent_filter; guintwindow_width, window_height; gchar *desktop_type = NULL; +GtkWidget *info_bar_content_area = gtk_info_bar_get_content_area ( +GTK_INFO_BAR (window-priv-warning)); GClosure*toggle_fullscreen_closure = g_cclosure_new ((GCallback)cb_rstto_main_window_fullscreen, window, NULL); GClosure*leave_fullscreen_closure = g_cclosure_new_swap ((GCallback)gtk_window_unfullscreen, window, NULL); @@ -587,8 +589,6 @@ rstto_main_window_init (RsttoMainWindow *window) window-priv-warning = gtk_info_bar_new(); window-priv-warning_label = gtk_label_new(NULL); -GtkWidget *info_bar_content_area = gtk_info_bar_get_content_area ( -GTK_INFO_BAR (window-priv-warning)); gtk_container_add ( GTK_CONTAINER (info_bar_content_area), window-priv-warning_label); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Fix Segfault and add ellipsize-config to warning label.
Updating branch refs/heads/ristretto-0.3 to 1c390a05044a2355c1c46a7aceccee7d3865031d (commit) from 7745cc7fb2a1cb074b10537e964d7bdb6eaa53ed (commit) commit 1c390a05044a2355c1c46a7aceccee7d3865031d Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:02:33 2012 +0100 Fix Segfault and add ellipsize-config to warning label. src/main_window.c | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index bdbb2f1..fb2fbc4 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -438,8 +438,7 @@ rstto_main_window_init (RsttoMainWindow *window) GtkRecentFilter *recent_filter; guintwindow_width, window_height; gchar *desktop_type = NULL; -GtkWidget *info_bar_content_area = gtk_info_bar_get_content_area ( -GTK_INFO_BAR (window-priv-warning)); +GtkWidget *info_bar_content_area = NULL; GClosure*toggle_fullscreen_closure = g_cclosure_new ((GCallback)cb_rstto_main_window_fullscreen, window, NULL); GClosure*leave_fullscreen_closure = g_cclosure_new_swap ((GCallback)gtk_window_unfullscreen, window, NULL); @@ -587,7 +586,12 @@ rstto_main_window_init (RsttoMainWindow *window) window-priv-image_viewer_menu = gtk_ui_manager_get_widget (window-priv-ui_manager, /image-viewer-menu); window-priv-position_menu = gtk_ui_manager_get_widget (window-priv-ui_manager, /navigation-toolbar-menu); window-priv-warning = gtk_info_bar_new(); +info_bar_content_area = gtk_info_bar_get_content_area ( +GTK_INFO_BAR (window-priv-warning)); window-priv-warning_label = gtk_label_new(NULL); +gtk_label_set_ellipsize ( +GTK_LABEL (window-priv-warning_label), +PANGO_ELLIPSIZE_END); gtk_container_add ( GTK_CONTAINER (info_bar_content_area), @@ -1085,6 +1089,9 @@ rstto_main_window_update_statusbar (RsttoMainWindow *window) g_free (status); status = tmp_status; gtk_label_set_text (GTK_LABEL(window-priv-warning_label), error-message); +gtk_widget_set_tooltip_text ( +window-priv-warning_label, +error-message); gtk_widget_show (window-priv-warning); } else @@ -3076,6 +3083,7 @@ cb_rstto_main_window_close ( window-priv-image_list, NULL, NULL); +gtk_widget_hide (window-priv-warning); } /** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Set Ellipsize mode to warning-label
Updating branch refs/heads/master to 79730cb7745207fba81da490a47de27242b0e176 (commit) from 96754ea5b1976bc181af9521f79b235f36f6fb6e (commit) commit 79730cb7745207fba81da490a47de27242b0e176 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:06:09 2012 +0100 Set Ellipsize mode to warning-label src/main_window.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index e42e2d6..3f962b1 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -622,6 +622,9 @@ rstto_main_window_init (RsttoMainWindow *window) window-priv-position_menu = gtk_ui_manager_get_widget (window-priv-ui_manager, /navigation-toolbar-menu); window-priv-warning = gtk_info_bar_new(); window-priv-warning_label = gtk_label_new(NULL); +gtk_label_set_ellipsize ( +GTK_LABEL (window-priv-warning_label), +PANGO_ELLIPSIZE_END); info_bar_content_area = gtk_info_bar_get_content_area ( GTK_INFO_BAR (window-priv-warning)); @@ -1141,6 +1144,9 @@ rstto_main_window_update_statusbar (RsttoMainWindow *window) g_free (status); status = tmp_status; gtk_label_set_text (GTK_LABEL(window-priv-warning_label), error-message); +gtk_widget_set_tooltip_text( +window-priv-warning_label, +error-message); gtk_widget_show (window-priv-warning); } else @@ -3250,6 +3256,7 @@ cb_rstto_main_window_close ( window-priv-image_list, NULL, NULL); +gtk_widget_hide (window-priv-warning); } /** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Update mime-types (Bug #8513)
Updating branch refs/heads/ristretto-0.3 to eadda0bce4125f9c0ded60ed504d0a6d4b1f5404 (commit) from 1c390a05044a2355c1c46a7aceccee7d3865031d (commit) commit eadda0bce4125f9c0ded60ed504d0a6d4b1f5404 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:16:54 2012 +0100 Update mime-types (Bug #8513) ristretto.desktop.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ristretto.desktop.in b/ristretto.desktop.in index 78f9c76..6b8233e 100644 --- a/ristretto.desktop.in +++ b/ristretto.desktop.in @@ -10,4 +10,4 @@ Type=Application X-MultipleArgs=false Categories=GTK;Graphics;Viewer; StartupNotify=true -MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-ico;image/x-pixmap;image/tiff; +MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-pixmap;image/tiff;image/svg+xml;image/x-xpixmap; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Run gtk-update-icon-cache on uninstall
Updating branch refs/heads/ristretto-0.3 to 15f313ad4053dc9ff95bc72cbf6b4d2bcf16d11a (commit) from aaa76c95b50a7eb0767b4f403609946e185b8b4d (commit) commit 15f313ad4053dc9ff95bc72cbf6b4d2bcf16d11a Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:18:43 2012 +0100 Run gtk-update-icon-cache on uninstall icons/Makefile.am | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/icons/Makefile.am b/icons/Makefile.am index 1d1e2e6..df49907 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -14,3 +14,14 @@ install-data-hook: echo *** $(gtk_update_icon_cache); \ echo ***; \ fi + +uninstall-hook: + @-if test -z $(DESTDIR); then \ + echo Updating Gtk icon cache.;\ + $(gtk_update_icon_cache); \ + else\ + echo *** Icon cache not updated. Remember to run:;\ + echo ***; \ + echo *** $(gtk_update_icon_cache); \ + echo ***; \ + fi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Update version number
Updating branch refs/heads/ristretto-0.3 to f5ddfd3a9ea15fc16904390c6b7bfb2ea9614e4c (commit) from 589b6a49f261c95a5357c9b97a0afa972f5a16f9 (commit) commit f5ddfd3a9ea15fc16904390c6b7bfb2ea9614e4c Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:19:23 2012 +0100 Update version number configure.in.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 8b7a84b..a41911d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *** m4_define([ristretto_version_major], [0]) m4_define([ristretto_version_minor], [3]) -m4_define([ristretto_version_micro], [4]) +m4_define([ristretto_version_micro], [5]) m4_define([ristretto_version_build], [r@REVISION@]) m4_define([ristretto_version_tag], []) # Leave empty for releases m4_define([ristretto_version], [ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(), [], [], [ristretto_version_tag()-ristretto_version_build()])]) @@ -21,7 +21,7 @@ dnl *** Debugging support for SVN snapshots *** dnl *** m4_define([ristretto_debug_default], [ifelse(ristretto_version_tag(), [git], [full], [minimum])]) -AC_COPYRIGHT([Copyright (c) 2006-2011 +AC_COPYRIGHT([Copyright (c) 2006-2012 The Xfce development team. All rights reserved. Written for Xfce by Stephan Arts step...@xfce.org.]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Update NEWS
Updating branch refs/heads/ristretto-0.3 to aaa76c95b50a7eb0767b4f403609946e185b8b4d (commit) from eadda0bce4125f9c0ded60ed504d0a6d4b1f5404 (commit) commit aaa76c95b50a7eb0767b4f403609946e185b8b4d Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:17:59 2012 +0100 Update NEWS NEWS |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 48831ea..9d36cd9 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,8 @@ -0.3.x +0.3.5 = - Fix bug #8343 (Do not use symbols from gtk+ 2.20) -- Report image-loading errors back to the user. +- Fix bug #8512 (Report image-loading errors back to the user.) +- Fix bug #8513 (ristretto.desktop mime-types list is incomplete) 0.3.4 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto|ristretto-0.3.5 Creating annotated tag ristretto-0.3.5
Updating annotated tag refs/tags/ristretto-0.3.5 as new annotated tag to 25f9ff384d3c6ce0b8afef3eea27dda4c8b120a8 (tag) succeeds ristretto-0.3.4-14-g589b6a4 tagged by Stephan Arts step...@xfce.org on 2012-03-03 12:21 +0100 Stephan Arts (1): Update version number ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Update year from 2011 to 2012
Updating branch refs/heads/ristretto-0.3 to 589b6a49f261c95a5357c9b97a0afa972f5a16f9 (commit) from 15f313ad4053dc9ff95bc72cbf6b4d2bcf16d11a (commit) commit 589b6a49f261c95a5357c9b97a0afa972f5a16f9 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:19:11 2012 +0100 Update year from 2011 to 2012 src/main_window.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index fb2fbc4..c1f4132 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -1,5 +1,5 @@ /* - * Copyright (c) Stephan Arts 2006-2011 step...@xfce.org + * Copyright (c) Stephan Arts 2006-2012 step...@xfce.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2495,7 +2495,7 @@ cb_rstto_main_window_about (GtkWidget *widget, RsttoMainWindow *window) gtk_about_dialog_set_license((GtkAboutDialog *)about_dialog, xfce_get_license_text(XFCE_LICENSE_TEXT_GPL)); gtk_about_dialog_set_copyright((GtkAboutDialog *)about_dialog, -Copyright \302\251 2006-2011 Stephan Arts); +Copyright \302\251 2006-2012 Stephan Arts); gtk_dialog_run(GTK_DIALOG(about_dialog)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Update mime-types (Bug #8513)
Updating branch refs/heads/master to 2c8316ef039037cba52f80c987b6b95e5cd33be3 (commit) from 79730cb7745207fba81da490a47de27242b0e176 (commit) commit 2c8316ef039037cba52f80c987b6b95e5cd33be3 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 12:16:54 2012 +0100 Update mime-types (Bug #8513) Conflicts: ristretto.desktop.in ristretto.desktop.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ristretto.desktop.in b/ristretto.desktop.in index 811ea07..6b8233e 100644 --- a/ristretto.desktop.in +++ b/ristretto.desktop.in @@ -10,4 +10,4 @@ Type=Application X-MultipleArgs=false Categories=GTK;Graphics;Viewer; StartupNotify=true -MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-ico;image/x-pixmap;image/tiff;image/svg+xml; +MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-pixmap;image/tiff;image/svg+xml;image/x-xpixmap; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-dict:master Adapting the plugin to panel version 4.9+
Updating branch refs/heads/master to 336b0b9a3001bf75803a042b080f3eb845bfff5a (commit) from 133ce7045b9ec45421a397fe9ac17eb3e288d21d (commit) commit 336b0b9a3001bf75803a042b080f3eb845bfff5a Author: Andrzej ndrwr...@gmail.com Date: Fri Feb 24 15:33:33 2012 +0900 Adapting the plugin to panel version 4.9+ Signed-off-by: Enrico Tröger enrico.troe...@uvena.de panel-plugin/xfce4-dict-plugin.c | 83 +++-- 1 files changed, 51 insertions(+), 32 deletions(-) diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c index 332f6ca..c52a449 100644 --- a/panel-plugin/xfce4-dict-plugin.c +++ b/panel-plugin/xfce4-dict-plugin.c @@ -51,6 +51,7 @@ typedef struct GtkWidget *panel_button; GtkWidget *panel_button_image; + GtkWidget *box; } DictPanelData; @@ -81,28 +82,49 @@ static GdkPixbuf *dict_plugin_load_and_scale(const guint8 *data, gint dstw, gint static gboolean dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint wsize, DictPanelData *dpd) { - gint width; - gint height = wsize; - gint size = wsize - 2 - (2 * MAX(dpd-panel_button-style-xthickness, + gint size; + gint bsize = wsize; + +#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) + bsize /= xfce_panel_plugin_get_nrows(plugin); +#endif + + size = bsize - 2 - (2 * MAX(dpd-panel_button-style-xthickness, dpd-panel_button-style-ythickness)); dpd-dd-icon = dict_plugin_load_and_scale(dict_gui_get_icon_data(), size, -1); gtk_image_set_from_pixbuf(GTK_IMAGE(dpd-panel_button_image), dpd-dd-icon); +#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) + if (dpd-dd-show_panel_entry + xfce_panel_plugin_get_mode(dpd-plugin) != XFCE_PANEL_PLUGIN_MODE_VERTICAL) + { + xfce_panel_plugin_set_small (plugin, FALSE); + if (xfce_panel_plugin_get_mode(dpd-plugin) == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) + gtk_widget_set_size_request(dpd-dd-panel_entry, dpd-dd-panel_entry_size, -1); + else + gtk_widget_set_size_request(dpd-dd-panel_entry, -1, -1); + gtk_orientable_set_orientation(GTK_ORIENTABLE(dpd-box), xfce_panel_plugin_get_orientation(dpd-plugin)); + gtk_widget_show(dpd-dd-panel_entry); + } + else + { + gtk_widget_hide(dpd-dd-panel_entry); + xfce_panel_plugin_set_small (plugin, TRUE); + } +#else if (dpd-dd-show_panel_entry xfce_panel_plugin_get_orientation(plugin) == GTK_ORIENTATION_HORIZONTAL) { - width = size + dpd-dd-panel_entry_size; + gtk_widget_show(dpd-dd-panel_entry); gtk_widget_set_size_request(dpd-dd-panel_entry, dpd-dd-panel_entry_size, -1); } else - width = size; - - if (xfce_panel_plugin_get_orientation(plugin) == GTK_ORIENTATION_VERTICAL) - height -= 4; /* reduce some of the height because it creates too much space otherwise */ + gtk_widget_hide(dpd-dd-panel_entry); +#endif - gtk_widget_set_size_request(dpd-panel_button, wsize, height); + gtk_widget_set_size_request(dpd-panel_button, bsize, bsize); return TRUE; } @@ -254,14 +276,20 @@ static void dict_plugin_free_data(XfcePanelPlugin *plugin, DictPanelData *dpd) } +#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) +static void dict_plugin_panel_change_mode(XfcePanelPlugin *plugin, + XfcePanelPluginMode mode, DictPanelData *dpd) +{ + dict_plugin_panel_set_size(plugin, xfce_panel_plugin_get_size(plugin), dpd); +} + +#else static void dict_plugin_panel_change_orientation(XfcePanelPlugin *plugin, GtkOrientation orientation, DictPanelData *dpd) { - if (! dpd-dd-show_panel_entry || orientation == GTK_ORIENTATION_VERTICAL) - gtk_widget_hide(dpd-dd-panel_entry); - else - gtk_widget_show(dpd-dd-panel_entry); + dict_plugin_panel_set_size(plugin, xfce_panel_plugin_get_size(plugin), dpd); } +#endif static void dict_plugin_style_set(XfcePanelPlugin *plugin, gpointer unused, DictPanelData *dpd) @@ -278,14 +306,6 @@ static void dict_plugin_write_rc_file(XfcePanelPlugin *plugin, DictPanelData *dp static void dict_plugin_panel_save_settings(DictPanelData *dpd) { - if (dpd-dd-show_panel_entry - xfce_panel_plugin_get_orientation(dpd-plugin) == GTK_ORIENTATION_HORIZONTAL) - { - gtk_widget_show(dpd-dd-panel_entry); - } -
[Xfce4-commits] xfce4-dict:master Adjust code style
Updating branch refs/heads/master to e58c5230e3ecb6d726fea25b41d6d3cb9eb482ae (commit) from 336b0b9a3001bf75803a042b080f3eb845bfff5a (commit) commit e58c5230e3ecb6d726fea25b41d6d3cb9eb482ae Author: Enrico Tröger enrico.troe...@uvena.de Date: Sat Mar 3 16:44:51 2012 +0100 Adjust code style panel-plugin/xfce4-dict-plugin.c | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c index c52a449..7b56501 100644 --- a/panel-plugin/xfce4-dict-plugin.c +++ b/panel-plugin/xfce4-dict-plugin.c @@ -85,7 +85,7 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint wsize, gint size; gint bsize = wsize; -#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) +#if defined(LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION(4,9,0) bsize /= xfce_panel_plugin_get_nrows(plugin); #endif @@ -96,11 +96,11 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint wsize, gtk_image_set_from_pixbuf(GTK_IMAGE(dpd-panel_button_image), dpd-dd-icon); -#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) +#if defined(LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION(4,9,0) if (dpd-dd-show_panel_entry xfce_panel_plugin_get_mode(dpd-plugin) != XFCE_PANEL_PLUGIN_MODE_VERTICAL) { - xfce_panel_plugin_set_small (plugin, FALSE); + xfce_panel_plugin_set_small(plugin, FALSE); if (xfce_panel_plugin_get_mode(dpd-plugin) == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) gtk_widget_set_size_request(dpd-dd-panel_entry, dpd-dd-panel_entry_size, -1); else @@ -111,7 +111,7 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint wsize, else { gtk_widget_hide(dpd-dd-panel_entry); - xfce_panel_plugin_set_small (plugin, TRUE); + xfce_panel_plugin_set_small(plugin, TRUE); } #else if (dpd-dd-show_panel_entry @@ -276,7 +276,7 @@ static void dict_plugin_free_data(XfcePanelPlugin *plugin, DictPanelData *dpd) } -#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) +#if defined(LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION(4,9,0) static void dict_plugin_panel_change_mode(XfcePanelPlugin *plugin, XfcePanelPluginMode mode, DictPanelData *dpd) { @@ -444,8 +444,8 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin) g_signal_connect(dpd-dd-close_button, clicked, G_CALLBACK(dict_plugin_close_button_clicked), dpd); g_signal_connect(plugin, free-data, G_CALLBACK(dict_plugin_free_data), dpd); g_signal_connect(plugin, size-changed, G_CALLBACK(dict_plugin_panel_set_size), dpd); -#if defined (LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION (4,9,0) - g_signal_connect(plugin, mode-changed, G_CALLBACK (dict_plugin_panel_change_mode), dpd); +#if defined(LIBXFCE4PANEL_CHECK_VERSION) LIBXFCE4PANEL_CHECK_VERSION(4,9,0) + g_signal_connect(plugin, mode-changed, G_CALLBACK(dict_plugin_panel_change_mode), dpd); #else g_signal_connect(plugin, orientation-changed, G_CALLBACK(dict_plugin_panel_change_orientation), dpd); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Added the root menu popup when there are no icons shown on the desktop.
Updating branch refs/heads/eric/bugzilla-patches to bae29238768a138626db145600f424b80bb171ce (commit) from ada952534e6d740cf3a8309c6465d853d9c253ad (commit) commit bae29238768a138626db145600f424b80bb171ce Author: Eric Koegel eric.koe...@gmail.com Date: Sun Feb 26 16:54:15 2012 +0300 Added the root menu popup when there are no icons shown on the desktop. src/xfce-desktop.c | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index 2fc51d0..654f986 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -876,10 +876,16 @@ xfce_desktop_button_press_event(GtkWidget *w, { guint button = evt-button; guint state = evt-state; - +g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE); + if(evt-type == GDK_BUTTON_PRESS) { -if(button == 2 || (button == 1 (state GDK_SHIFT_MASK) -(state GDK_CONTROL_MASK))) +if(XFCE_DESKTOP(w)-priv-icons_style == XFCE_DESKTOP_ICON_STYLE_NONE +(button == 3 || (button == 1 (state GDK_SHIFT_MASK { +xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), + button, + evt-time); +} else if(button == 2 || (button == 1 (state GDK_SHIFT_MASK) + (state GDK_CONTROL_MASK))) { xfce_desktop_popup_secondary_root_menu(XFCE_DESKTOP(w), button, evt-time); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Fix a segfault when tumbler isn't available.
Updating branch refs/heads/eric/bugzilla-patches to ada952534e6d740cf3a8309c6465d853d9c253ad (commit) from 95a5f72c444ff26777831fdffcffe64015324c4c (commit) commit ada952534e6d740cf3a8309c6465d853d9c253ad Author: Eric Koegel eric.koe...@gmail.com Date: Sun Feb 26 15:49:11 2012 +0300 Fix a segfault when tumbler isn't available. The patch was provided by Lionel Le Folgoc lio...@lefolgoc.net common/xfdesktop-thumbnailer.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/xfdesktop-thumbnailer.c b/common/xfdesktop-thumbnailer.c index 3cc157b..accc561 100644 --- a/common/xfdesktop-thumbnailer.c +++ b/common/xfdesktop-thumbnailer.c @@ -130,8 +130,8 @@ xfdesktop_thumbnailer_init(GObject *object) org.freedesktop.thumbnails.Thumbnailer1); if(thumbnailer-priv-proxy) { -gchar **supported_uris; -gchar **supported_flavors; +gchar **supported_uris = NULL; +gchar **supported_flavors = NULL; dbus_g_object_register_marshaller( (GClosureMarshal) xfdesktop_marshal_VOID__UINT_BOXED, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Change g_debug messages to DBG
Updating branch refs/heads/eric/bugzilla-patches to 1a13ea55d5d25479ec3b4e849505b32ee2193854 (commit) from bae29238768a138626db145600f424b80bb171ce (commit) commit 1a13ea55d5d25479ec3b4e849505b32ee2193854 Author: Eric Koegel eric.koe...@gmail.com Date: Fri Mar 2 10:42:50 2012 +0300 Change g_debug messages to DBG common/xfdesktop-thumbnailer.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xfdesktop-thumbnailer.c b/common/xfdesktop-thumbnailer.c index accc561..8f39fe9 100644 --- a/common/xfdesktop-thumbnailer.c +++ b/common/xfdesktop-thumbnailer.c @@ -38,6 +38,7 @@ #include dbus/dbus-glib.h +#include libxfce4util/libxfce4util.h #include xfdesktop-thumbnailer.h #include xfdesktop-marshal.h @@ -166,14 +167,13 @@ xfdesktop_thumbnailer_init(GObject *object) if(supported_flavors != NULL) { gint n; for(n = 0; supported_flavors[n] != NULL; ++n) { -g_debug(flavor: %s, supported_flavors[n]); if(g_strcmp0(supported_flavors[n], large)) { thumbnailer-priv-big_thumbnails = TRUE; } } } else { thumbnailer-priv-big_thumbnails = FALSE; -g_debug(Thumbnailer failed to Get Flavors); +g_warning(Thumbnailer failed calling GetFlavors); } g_strfreev(supported_flavors); @@ -300,7 +300,7 @@ xfdesktop_thumbnailer_is_supported(XfdesktopThumbnailer *thumbnailer, mime_type = xfdesktop_get_file_mimetype(file); if(mime_type == NULL) { -g_warning(File has no mime type); +DBG(File %s has no mime type, file); return FALSE; } @@ -334,7 +334,7 @@ xfdesktop_thumbnailer_queue_thumbnail(XfdesktopThumbnailer *thumbnailer, g_return_val_if_fail(file != NULL, FALSE); if(!xfdesktop_thumbnailer_is_supported(thumbnailer, file)) { -g_debug(file: %s not supported, file); +DBG(file: %s not supported, file); return FALSE; } if(thumbnailer-priv-request_timer_id) { @@ -533,7 +533,7 @@ xfdesktop_thumbnailer_thumbnail_ready_dbus(DBusGProxy *proxy, .thumbnails, thumbnail_flavor, filename, NULL); -g_debug(thumbnail-ready src: %s thumbnail: %s, +DBG(thumbnail-ready src: %s thumbnail: %s, (char*)iter-data, thumbnail_location); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Fix xinerama_stretch not refreshing on all monitors
Updating branch refs/heads/eric/bugzilla-patches to a18cb32c970f2355cfa86bf6763e31efa93e1df5 (commit) from 1a13ea55d5d25479ec3b4e849505b32ee2193854 (commit) commit a18cb32c970f2355cfa86bf6763e31efa93e1df5 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Mar 3 16:20:29 2012 +0300 Fix xinerama_stretch not refreshing on all monitors src/xfce-desktop.c | 25 +++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index 654f986..b1ad65f 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -335,8 +335,29 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) pix = xfce_backdrop_get_pixbuf(backdrop); if(!pix) return; - -gdk_screen_get_monitor_geometry(gscreen, monitor, rect); + +if(desktop-priv-xinerama_stretch) { +GdkRectangle monitor_rect; + +gdk_screen_get_monitor_geometry(gscreen, 0, rect); + +/* Get the lowest x and y value for all the monitors in + * case none of them start at 0,0 for whatever reason. + */ +for(i = 1; i (guint)gdk_screen_get_n_monitors(gscreen); i++) { +gdk_screen_get_monitor_geometry(gscreen, i, monitor_rect); + +if(monitor_rect.x rect.x) +rect.x = monitor_rect.x; +if(monitor_rect.y rect.y) +rect.y = monitor_rect.y; +} + +rect.width = gdk_screen_get_width(gscreen); +rect.height = gdk_screen_get_height(gscreen); +} else { +gdk_screen_get_monitor_geometry(gscreen, monitor, rect); +} gdk_draw_pixbuf(GDK_DRAWABLE(pmap), GTK_WIDGET(desktop)-style-black_gc, pix, 0, 0, rect.x, rect.y, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Get correct workspace size with multimon display
Updating branch refs/heads/eric/bugzilla-patches to d3211fcb34491200bf60d1e38ace87f0ca8ee4c0 (commit) from a18cb32c970f2355cfa86bf6763e31efa93e1df5 (commit) commit d3211fcb34491200bf60d1e38ace87f0ca8ee4c0 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Mar 3 18:08:45 2012 +0300 Get correct workspace size with multimon display When multiple montiors are used and a Virtual desktop size is configured in Xorg, it will always return that size rather than the actual size displayed. This patch changes how the size is calculated so that icons stay in their location when the resolution reverts back. src/xfdesktop-file-icon-manager.c | 28 +++- src/xfdesktop-icon-view.c |8 +--- src/xfdesktop-icon-view.h |8 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index 9e90df7..0c6b244 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -1781,13 +1781,22 @@ xfdesktop_file_icon_manager_save_icons(gpointer user_data) XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); gchar relpath[PATH_MAX], *tmppath, *path; XfceRc *rcfile; +gint x = 0, y = 0, width = 0, height = 0; fmanager-priv-save_icons_id = 0; - + +xfdesktop_get_workarea_single(fmanager-priv-icon_view, + 0, + x, + y, + width, + height); + g_snprintf(relpath, PATH_MAX, xfce4/desktop/icons.screen%d-%dx%d.rc, gdk_screen_get_number(fmanager-priv-gscreen), - gdk_screen_get_width(fmanager-priv-gscreen), - gdk_screen_get_height(fmanager-priv-gscreen)); + width, + height); + path = xfce_resource_save_location(XFCE_RESOURCE_CONFIG, relpath, TRUE); if(!path) return FALSE; @@ -1853,11 +1862,20 @@ xfdesktop_file_icon_manager_get_cached_icon_position(XfdesktopFileIconManager *f gchar relpath[PATH_MAX]; gchar *filename = NULL; gboolean ret = FALSE; +gint x = 0, y = 0, width = 0, height = 0; + +xfdesktop_get_workarea_single(fmanager-priv-icon_view, + 0, + x, + y, + width, + height); g_snprintf(relpath, PATH_MAX, xfce4/desktop/icons.screen%d-%dx%d.rc, gdk_screen_get_number(fmanager-priv-gscreen), - gdk_screen_get_width(fmanager-priv-gscreen), - gdk_screen_get_height(fmanager-priv-gscreen)); + width, + height); + filename = xfce_resource_lookup(XFCE_RESOURCE_CONFIG, relpath); /* Check if we have to migrate from the old file format */ diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c index 868ba41..cf2e977 100644 --- a/src/xfdesktop-icon-view.c +++ b/src/xfdesktop-icon-view.c @@ -304,12 +304,6 @@ static void xfdesktop_screen_size_changed_cb(GdkScreen *gscreen, static GdkFilterReturn xfdesktop_rootwin_watch_workarea(GdkXEvent *gxevent, GdkEvent *event, gpointer user_data); -static gboolean xfdesktop_get_workarea_single(XfdesktopIconView *icon_view, - guint ws_num, - gint *xorigin, - gint *yorigin, - gint *width, - gint *height); static void xfdesktop_grid_do_resize(XfdesktopIconView *icon_view); static inline gboolean xfdesktop_rectangle_contains_point(GdkRectangle *rect, gint x, @@ -3128,7 +3122,7 @@ xfdesktop_grid_resize_timeout(gpointer user_data) } -static gboolean +gboolean xfdesktop_get_workarea_single(XfdesktopIconView *icon_view, guint ws_num, gint *xorigin, diff --git a/src/xfdesktop-icon-view.h b/src/xfdesktop-icon-view.h index 95bddd4..f9f5cbf 100644 --- a/src/xfdesktop-icon-view.h +++ b/src/xfdesktop-icon-view.h @@ -118,6 +118,14 @@ gdouble xfdesktop_icon_view_get_font_size(XfdesktopIconView *icon_view); GtkWidget *xfdesktop_icon_view_get_window_widget(XfdesktopIconView *icon_view); +gboolean +xfdesktop_get_workarea_single(XfdesktopIconView *icon_view, + guint ws_num, + gint *xorigin, + gint *yorigin, + gint *width, +
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Comments in .desktop files are displayed in the tooltip (bug 8509)
Updating branch refs/heads/eric/bugzilla-patches to 2fac2c92ccb2fec0d6b64aa97c1f2315836d3ab1 (commit) from d3211fcb34491200bf60d1e38ace87f0ca8ee4c0 (commit) commit 2fac2c92ccb2fec0d6b64aa97c1f2315836d3ab1 Author: Eric Koegel eric.koe...@gmail.com Date: Fri Mar 2 15:00:36 2012 +0300 Comments in .desktop files are displayed in the tooltip (bug 8509) src/xfdesktop-regular-file-icon.c | 40 - 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index db6e66b..f42f6d6 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -516,13 +516,27 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) if(!regular_file_icon-priv-tooltip) { GFileInfo *info = xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(icon)); -const gchar *content_type; +const gchar *content_type, *comment = NULL; gchar *description, *size_string, *time_string; guint64 size, mtime; +gboolean is_desktop_file = FALSE; if(!info) return NULL; +if(g_content_type_equals(g_file_info_get_content_type(info), + application/x-desktop)) +{ +is_desktop_file = TRUE; +} +else +{ + gchar *uri = g_file_get_uri(regular_file_icon-priv-file); + if(g_str_has_suffix(uri, .desktop)) + is_desktop_file = TRUE; + g_free(uri); +} + content_type = g_file_info_get_content_type(info); description = g_content_type_get_description(content_type); @@ -534,10 +548,34 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) G_FILE_ATTRIBUTE_TIME_MODIFIED); time_string = xfdesktop_file_utils_format_time_for_display(mtime); +/* Extract the Comment entry from the .desktop file */ +if(is_desktop_file) +{ +gchar *path = g_file_get_path(regular_file_icon-priv-file); +XfceRc *rcfile = xfce_rc_simple_open(path, TRUE); +g_free(path); + +if(rcfile) { +xfce_rc_set_group(rcfile, Desktop Entry); +comment = xfce_rc_read_entry(rcfile, Comment, NULL); +} + +xfce_rc_close(rcfile); +} + regular_file_icon-priv-tooltip = g_strdup_printf(_(Type: %s\nSize: %s\nLast modified: %s), description, size_string, time_string); +/* Prepend the comment to the tooltip */ +if(is_desktop_file comment != NULL) { +gchar *tooltip = regular_file_icon-priv-tooltip; +regular_file_icon-priv-tooltip = g_strdup_printf(%s\n%s, + comment, + tooltip); +g_free(tooltip); +} + g_free(time_string); g_free(size_string); g_free(description); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 8a976dc89c57774f53a91f623313394da1f15a91 (commit) from fed9f4b961dd88ebaf0203a658d4a93c713b7280 (commit) commit 8a976dc89c57774f53a91f623313394da1f15a91 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Sat Mar 3 19:13:57 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 67 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/po/uk.po b/po/uk.po index 3075632..8d8f1c1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-appfinder\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-24 17:24+\n +POT-Creation-Date: 2012-03-03 12:36+\n PO-Revision-Date: 2009-01-26 11:48+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n @@ -215,10 +215,13 @@ msgstr #: ../src/appfinder-preferences.glade.h:14 msgid -Instead of quiting the application when the last window is closed, keep a +Instead of quitting the application when the last window is closed, keep a running instance to speed up opening new windows. You might want to disable this to reduce memory usage. -msgstr Замість того, щоб виходити з програми коли останнє вікно закрите, зберігати програму запущеною, щоб пришвидшити відкриття нового вікна. По бажанню Ви можете виключити цю опцію для зменшення використання пам’яті. +msgstr +Замість того, щоб виходити з програми коли останнє вікно закрите, зберігати +програму запущеною, щоб пришвидшити відкриття нового вікна. По бажанню Ви +можете виключити цю опцію для зменшення використання пам’яті. #: ../src/appfinder-preferences.glade.h:15 msgid Ite_m icon size: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Editor: Set sensitivity of save button on init.
Updating branch refs/heads/master to 2cf2692843a39f5b6a1f47792527f62ea7ad (commit) from 0c51b02d7f26125d46ea819aa17628ecefa254a3 (commit) commit 2cf2692843a39f5b6a1f47792527f62ea7ad Author: Nick Schermer n...@xfce.org Date: Sat Mar 3 20:29:16 2012 +0100 Editor: Set sensitivity of save button on init. xfce4-settings-editor/xfce-settings-prop-dialog.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xfce4-settings-editor/xfce-settings-prop-dialog.c b/xfce4-settings-editor/xfce-settings-prop-dialog.c index 4a137ba..c69e423 100644 --- a/xfce4-settings-editor/xfce-settings-prop-dialog.c +++ b/xfce4-settings-editor/xfce-settings-prop-dialog.c @@ -136,6 +136,7 @@ xfce_settings_prop_dialog_init (XfceSettingsPropDialog *dialog) GtkListStore*store; guinti; GtkCellRenderer *render; +GtkWidget *save_button; gtk_window_set_title (GTK_WINDOW (dialog), _(New Property)); gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 200); @@ -144,6 +145,9 @@ xfce_settings_prop_dialog_init (XfceSettingsPropDialog *dialog) GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); +save_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); +gtk_widget_set_sensitive (save_button, FALSE); + table = gtk_table_new (5, 2, FALSE); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Clear tooltip if image is closed
Updating branch refs/heads/master to 40bd604d835cf5d113f416107730eb145984b2f5 (commit) from 2c8316ef039037cba52f80c987b6b95e5cd33be3 (commit) commit 40bd604d835cf5d113f416107730eb145984b2f5 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 21:30:57 2012 +0100 Clear tooltip if image is closed src/image_viewer.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 86bbfff..16093b8 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1501,6 +1501,8 @@ rstto_image_viewer_set_file ( widget-window, NULL, FALSE); + +gtk_widget_set_tooltip_text (GTK_WIDGET (viewer), NULL); } } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Clear tooltip if image is closed
Updating branch refs/heads/ristretto-0.3 to 81defc54001ac65dd3f955bb8206fb23542a70e9 (commit) from f5ddfd3a9ea15fc16904390c6b7bfb2ea9614e4c (commit) commit 81defc54001ac65dd3f955bb8206fb23542a70e9 Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 21:30:57 2012 +0100 Clear tooltip if image is closed src/image_viewer.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 7e5baf0..aed2fa2 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1501,6 +1501,8 @@ rstto_image_viewer_set_file ( widget-window, NULL, FALSE); + +gtk_widget_set_tooltip_text (GTK_WIDGET (viewer), NULL); } } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:ristretto-0.3 Update NEWS
Updating branch refs/heads/ristretto-0.3 to a60fc2673dcad9270cd30572261f4eb062bb4d7c (commit) from 81defc54001ac65dd3f955bb8206fb23542a70e9 (commit) commit a60fc2673dcad9270cd30572261f4eb062bb4d7c Author: Stephan Arts step...@xfce.org Date: Sat Mar 3 21:31:43 2012 +0100 Update NEWS NEWS |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 9d36cd9..a4d30e7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +x.x.x += +- Clear tooltip if image is closed + 0.3.5 = - Fix bug #8343 (Do not use symbols from gtk+ 2.20) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-embed-plugin:master l10n: Initial translation of Indonesian
Updating branch refs/heads/master to 55d4ddcfaac1531fca50de240e6c739a5ef3deed (commit) from 3d795e05c519258e02f25460a4f585b32524ab2b (commit) commit 55d4ddcfaac1531fca50de240e6c739a5ef3deed Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sun Mar 4 06:07:01 2012 +0100 l10n: Initial translation of Indonesian New status: 30 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/{zh_CN.po = id.po} | 100 --- 1 files changed, 51 insertions(+), 49 deletions(-) diff --git a/po/zh_CN.po b/po/id.po similarity index 62% copy from po/zh_CN.po copy to po/id.po index 147cf50..34926b8 100644 --- a/po/zh_CN.po +++ b/po/id.po @@ -1,61 +1,60 @@ -# Simplified Chinese translations for -# the xfce4-embed-plugin package. -# This file is distributed under the same license as -# the xfce4-embed-plugin package. -# Chipong Luo chipong@yahoo.com, 2012. +# Indonesian translations for xfce4-embed-plugin package. +# Copyright (C) 2012 THE xfce4-embed-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-embed-plugin package. +# Andhika Padmawan andhika.padma...@gmail.com, 2012. # msgid msgstr Project-Id-Version: xfce4-embed-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-17 04:39+\n -PO-Revision-Date: 2012-02-16 17:29+0600\n -Last-Translator: Chipong Luo chipong@yahoo.com\n -Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n -Language: zh_CN\n +POT-Creation-Date: 2012-03-04 00:54+\n +PO-Revision-Date: 2012-03-04 12:06+0700\n +Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n +Language-Team: Indonesian translation-team...@lists.sourceforge.net\n +Language: id\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n #: ../panel-plugin/embed.c:48 msgid Embed -msgstr 嵌入 +msgstr Tanam #. pop out menu item, not shown by default #: ../panel-plugin/embed.c:244 msgid Pop _Out -msgstr 弹出(_O) +msgstr _Keluar #. embed menu item, shown by default. #: ../panel-plugin/embed.c:249 msgid _Embed -msgstr 嵌入(_E) +msgstr _Tanam #. focus menu item, not shown by default #: ../panel-plugin/embed.c:255 msgid _Focus -msgstr 聚焦(_F) +msgstr _Fokus #: ../panel-plugin/embed-dialogs.c:51 #, c-format msgid Unable to open the following url: %s -msgstr 未能打开以下 url:%s +msgstr Tak dapat membuka url berikut: %s #: ../panel-plugin/embed-dialogs.c:100 msgid Input is valid -msgstr 输入有效 +msgstr Masukan sah #: ../panel-plugin/embed-dialogs.c:105 msgid Input is invalid -msgstr 输入无效 +msgstr Masukan tidak sah #: ../panel-plugin/embed-dialogs.c:317 ../panel-plugin/embed.desktop.in.h:1 msgid Embed Plugin -msgstr 嵌入插件 +msgstr Plugin Tanam #: ../panel-plugin/embed-dialogs.c:326 msgid Application Launching -msgstr 应用程序启动 +msgstr Peluncur Aplikasi #: ../panel-plugin/embed-dialogs.c:328 #, c-format @@ -65,9 +64,10 @@ msgid that matches the below criteria, or it can use the socket ID passed\n to it (%s) to embed itself automatically. msgstr -如果未发现窗口(或没有标准),可以选择启动的命令。\n -命令要么带来与以下标准匹配的窗口,要么使用传送给\n -它(%s)用来自动嵌入其自身的套接字 ID。 +Jika sebuah jendela tidak ditemukan (atau tidak ada kriteria), perintah\n +dapat dijalankan secara opsional. Perintah dapat dihasilkan dalam jendela\n +yang cocok dengan kriteria di bawah, atau dapat menggunakan ID soket\n +yang dilewatkan (%s) untuk menanamkan perintah secara otomatis. #: ../panel-plugin/embed-dialogs.c:336 #, c-format @@ -75,12 +75,12 @@ msgid Leave blank to not launch anything\n %s expands to the socket ID msgstr -留空不启动任何东西\n -%s 扩展为套接字 ID +Biarkan kosong untuk tidak menjalankan apapun\n +%s meluaskan ke ID soket #: ../panel-plugin/embed-dialogs.c:339 msgid L_aunch command -msgstr 启动命令(_A) +msgstr J_alankan perintah #. poll_delay #. No UI element. Generally polling is unnecessary, unless you have a very @@ -88,55 +88,57 @@ msgstr 启动命令(_A) #. * identifiable when it is mapped. #: ../panel-plugin/embed-dialogs.c:348 msgid Selection Criteria -msgstr 选择标准 +msgstr Kriteria Pilihan #: ../panel-plugin/embed-dialogs.c:350 msgid The window to embed must match all of the non-blank criteria.\n Leave everything blank to rely on a launch command with socket ID. msgstr -要嵌入的窗口必须与所有非空的标准匹配。\n -留空一切以便依靠带套接字的启动命令。 +Jendela untuk ditanam harus cocok dengan semua kriteria yang tidak +dikosongkan.\n +Biarkan semuanya kosong untuk mengandalkan perintah luncurkan dengan +ID soket. #: ../panel-plugin/embed-dialogs.c:354 msgid _Process name -msgstr 进程名称(_P) +msgstr _Nama proses #: ../panel-plugin/embed-dialogs.c:355 msgid Match the window's application's process name\n Leave blank if it is not a criterion msgstr -匹配此窗口的应用程序的进程名称\n -如果它不是一个标准则留空 +Cocokkan nama proses aplikasi jendela\n +Biarkan kosong jika bukan sebuah kriteria #: ../panel-plugin/embed-dialogs.c:361 msgid _Window class -msgstr