[Xfce4-commits] xfwm4:master Increase timeout for other WM to exit with --replace, add visual feedback while waiting.
Updating branch refs/heads/master to 006f92a6d3308a9cde8decd3e47d75f3c5181f5e (commit) from 407a67dc68bcf3e10406f2d79bc7c1d649f098f5 (commit) commit 006f92a6d3308a9cde8decd3e47d75f3c5181f5e Author: Olivier Fourdan four...@xfce.org Date: Tue Oct 18 09:07:08 2011 +0200 Increase timeout for other WM to exit with --replace, add visual feedback while waiting. src/screen.c | 13 - 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/screen.c b/src/screen.c index 9851387..1642a5d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -50,6 +50,10 @@ #include compositor.h #include ui_style.h +#ifndef WM_EXITING_TIMEOUT +#define WM_EXITING_TIMEOUT 15 /*seconds */ +#endif + gboolean myScreenCheckWMAtom (ScreenInfo *screen_info, Atom atom) { @@ -109,8 +113,9 @@ myScreenSetWMAtom (ScreenInfo *screen_info, gboolean replace_wm) /* Waiting for previous window manager to exit */ if (current_wm) { +g_print (Waiting for current window manager on screen %d to exit, screen_info-screen); wait = 0; -timeout = 10 * G_USEC_PER_SEC; +timeout = WM_EXITING_TIMEOUT * G_USEC_PER_SEC; while (wait timeout) { if (XCheckWindowEvent (display_info-dpy, current_wm, StructureNotifyMask, event) (event.type == DestroyNotify)) @@ -119,13 +124,19 @@ myScreenSetWMAtom (ScreenInfo *screen_info, gboolean replace_wm) } g_usleep(G_USEC_PER_SEC / 10); wait += G_USEC_PER_SEC / 10; +if (wait % G_USEC_PER_SEC == 0) +{ + g_print (.); +} } if (wait = timeout) { +g_print( Failed\n); g_warning(Previous window manager on screen %d is not exiting, screen_info-screen); return FALSE; } +g_print( Done\n); } return TRUE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Optimize transients for group evaluation while withdrawing windows.
Updating branch refs/heads/master to 33d41a823b2f5fabf458af6f6513d34d3ce86327 (commit) from 006f92a6d3308a9cde8decd3e47d75f3c5181f5e (commit) commit 33d41a823b2f5fabf458af6f6513d34d3ce86327 Author: Olivier Fourdan four...@xfce.org Date: Tue Oct 18 09:08:07 2011 +0200 Optimize transients for group evaluation while withdrawing windows. src/client.c | 39 +++ 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/client.c b/src/client.c index bf5ca9a..175e984 100644 --- a/src/client.c +++ b/src/client.c @@ -2318,32 +2318,31 @@ clientWithdraw (Client * c, guint ws, gboolean iconify) continue; } -/* ws is used when transitioning between desktops, to avoid - hiding a transient for group that will be shown again on the new - workspace (transient for groups can be transients for multiple - ancesors splitted across workspaces...) - */ -if (clientIsTransientOrModal (c2) -clientTransientOrModalHasAncestor (c2, ws)) +if (FLAG_TEST (c2-flags, CLIENT_FLAG_STICKY) !iconify) { -/* Other ancestors for that transient window are visible on - * the specified workspace, so don't hide it... - */ continue; } -if (clientIsTransientOrModalForGroup (c2) -clientTransientOrModalHasAncestor (c2, c2-win_workspace)) +if (clientIsTransientOrModalForGroup (c2)) { -/* Other ancestors for that transient for group are still - * visible on current workspace, so don't hide it... - */ -continue; -} -if (FLAG_TEST (c2-flags, CLIENT_FLAG_STICKY) !iconify) -{ -continue; +if (clientTransientOrModalHasAncestor (c2, c2-win_workspace)) +{ +/* Other ancestors for that transient for group are still + * visible on current workspace, so don't hide it... + */ +continue; +} +if ((ws != c2-win_workspace) +clientTransientOrModalHasAncestor (c2, ws)) +{ +/* ws is used when transitioning between desktops, to avoid + hiding a transient for group that will be shown again on the new + workspace (transient for groups can be transients for multiple + ancesors splitted across workspaces...) + */ +continue; +} } clientWithdrawSingle (c2, list_of_windows, iconify); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master l10n: Updated German (de) translation to 97%
Updating branch refs/heads/master to c13263ffd4e76189719fa218cfb07f9bb311 (commit) from 6693d528944ff06d7a4273b5aa3c02fdae0957be (commit) commit c13263ffd4e76189719fa218cfb07f9bb311 Author: Christoph Wickert christoph.wick...@googlemail.com Date: Tue Oct 18 12:37:40 2011 +0200 l10n: Updated German (de) translation to 97% New status: 123 messages complete with 3 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 34 -- 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/de.po b/po/de.po index 02167a7..59bef14 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the ristretto package. # Christian Dywan christ...@twotoasts.de, 2007. # Fabian Nowak timyst...@arcor.de, 2007, 2008. -# +# msgid msgstr Project-Id-Version: ristretto\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2010-02-18 15:50+0100\n Last-Translator: Fabian Nowak timyst...@arcor.de\n Language-Team: German\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../src/main.c:57 msgid Version information @@ -61,11 +61,11 @@ msgstr Eine Kopie des Bildes speichern #: ../src/main_window.c:283 msgid _Properties -msgstr +msgstr _Eigenschaften #: ../src/main_window.c:283 msgid Show file properties -msgstr +msgstr Eigenschaften der Datei anzeigen #: ../src/main_window.c:284 msgid _Close @@ -211,9 +211,8 @@ msgid _Position msgstr _Position #: ../src/main_window.c:328 -#, fuzzy msgid Thumbnailbar _Position -msgstr Miniaturbilder +msgstr _Position der Miniaturvorschau #. Misc #: ../src/main_window.c:330 @@ -378,16 +377,15 @@ msgstr Hintergrundfarbe #: ../src/preferences_dialog.c:195 msgid Toolbars -msgstr +msgstr Werkzeugleisten #: ../src/preferences_dialog.c:200 msgid Override background color: msgstr Hintergrundfarbe ersetzen: #: ../src/preferences_dialog.c:211 -#, fuzzy msgid Merge toolbars -msgstr Zu löschender Zeitraum: +msgstr Werkzeugleisten zusammenfassen #: ../src/preferences_dialog.c:239 msgid Slideshow @@ -464,32 +462,33 @@ msgstr Einstellungen für den Bildbetrachter #: ../src/properties_dialog.c:152 msgid bName:/b -msgstr +msgstr bName:/b #: ../src/properties_dialog.c:153 +#, fuzzy msgid bKind:/b -msgstr +msgstr bTyp:/b #: ../src/properties_dialog.c:154 msgid bModified:/b -msgstr +msgstr bGeändert:/b #: ../src/properties_dialog.c:155 msgid bAccessed:/b -msgstr +msgstr bZugegriffen:/b #: ../src/properties_dialog.c:156 msgid bSize:/b -msgstr +msgstr bGröße:/b #: ../src/properties_dialog.c:280 msgid General -msgstr +msgstr Allgemein #: ../src/properties_dialog.c:390 #, c-format msgid %s - Properties -msgstr +msgstr Eigenschaften von %s #: ../src/thumbnail_bar.c:193 msgid Spacing @@ -557,9 +556,8 @@ msgid Look at your images's easily msgstr Bilder anschauen leicht gemacht #: ../ristretto.desktop.in.h:3 -#, fuzzy msgid Ristretto Image Viewer -msgstr Bildbetrachter Ristretto +msgstr Ristretto Bildbetrachter #~ msgid Open _Folder #~ msgstr _Ordner öffnen ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] moka:nick/maintainer-improvements Update mail address.
Updating branch refs/heads/nick/maintainer-improvements to 0a2bfa581073c4836c653d7ad6cae63e41a30a89 (commit) from 2e0a51209982062c4d2ea9127845813c5de5ff6c (commit) commit 0a2bfa581073c4836c653d7ad6cae63e41a30a89 Author: Nick Schermer n...@xfce.org Date: Tue Oct 18 18:09:25 2011 +0200 Update mail address. lib/views/email/login_forget.erb|2 +- lib/views/email/maintainer_activated.erb|2 +- lib/views/email/maintainer_change_email.erb |2 +- lib/views/email/maintainer_change_ssh.erb |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/views/email/login_forget.erb b/lib/views/email/login_forget.erb index 50e4904..ae5eca8 100644 --- a/lib/views/email/login_forget.erb +++ b/lib/views/email/login_forget.erb @@ -12,7 +12,7 @@ If you are not the person who made this request, or you wish to cancel this requ If you do nothing, the request will lapse after 2 hours (%= params[:token_expire] %) or when you log in successfully. -The request was generated from %= request.env['REMOTE_ADDR'] %. Forward this email to the Xfce administrators relea...@xfce.org in case of problems. +The request was generated from %= request.env['REMOTE_ADDR'] %. Forward this email to the Xfce administrators sysad...@xfce.org in case of problems. Always at your service. diff --git a/lib/views/email/maintainer_activated.erb b/lib/views/email/maintainer_activated.erb index 3a11a42..c811687 100644 --- a/lib/views/email/maintainer_activated.erb +++ b/lib/views/email/maintainer_activated.erb @@ -4,7 +4,7 @@ Your account has been activated. You can view your permissions in the profile ta Please keep in mind that updating the SSH public-keys on the server can take up to 1 hour. -If you have any questions, don't hesitate to contact us at relea...@xfce.org. +If you have any questions, don't hesitate to contact us at sysad...@xfce.org. Always at your service. diff --git a/lib/views/email/maintainer_change_email.erb b/lib/views/email/maintainer_change_email.erb index e40e8b2..aa3a464 100644 --- a/lib/views/email/maintainer_change_email.erb +++ b/lib/views/email/maintainer_change_email.erb @@ -2,7 +2,7 @@ Hello %= @maintainer.username %, this is Moka at %= Moka::Models::Configurati Your e-mail address was changed from %= @maintainer.email % to %= params[:email] % from IP %= request.env['REMOTE_ADDR'] % on %= Time.now.to_s %. -If you think someone else logged into your account, please forward this email to the Xfce developers at relea...@xfce.org. +If you think someone else logged into your account, please forward this email to the Xfce developers at sysad...@xfce.org. Always at your service. diff --git a/lib/views/email/maintainer_change_ssh.erb b/lib/views/email/maintainer_change_ssh.erb index 5c503f5..ec46b51 100644 --- a/lib/views/email/maintainer_change_ssh.erb +++ b/lib/views/email/maintainer_change_ssh.erb @@ -2,7 +2,7 @@ Hello %= @maintainer.username %, this is Moka at %= Moka::Models::Configurati Your SSH public-keys were changed from IP %= request.env['REMOTE_ADDR'] % on %= Time.now.to_s %. -If you think someone else logged into your account, please forward this email to the Xfce developers at relea...@xfce.org. +If you think someone else logged into your account, please forward this email to the Xfce developers at sysad...@xfce.org. Always at your service. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] squeeze:stephan/ui Remove the option to disable the toolbar/pathbar at compiletime
Updating branch refs/heads/stephan/ui to e0a63500cbd8a0feb33bfd5d55bd7a513fd39492 (commit) from 122a306824e83c1e78f1c6cf313418183bf78a97 (commit) commit e0a63500cbd8a0feb33bfd5d55bd7a513fd39492 Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 18:40:56 2011 +0200 Remove the option to disable the toolbar/pathbar at compiletime configure.in.in | 20 src/Makefile.am | 25 - src/main_window.c |5 - 3 files changed, 8 insertions(+), 42 deletions(-) diff --git a/configure.in.in b/configure.in.in index 6c0bd27..daefe21 100644 --- a/configure.in.in +++ b/configure.in.in @@ -92,26 +92,6 @@ fi AM_CONDITIONAL([HAVE_PCRE], [test x$ac_cv_header_pcre_h = xyes -a x$ac_cv_lib_pcre_main = xyes]) -AC_ARG_ENABLE([pathbar], - [AC_HELP_STRING([--disable-pathbar], -[Do not compile support for a PathBar (default=enabled)])], -[sq_pathbar=$enableval], -[sq_pathbar=yes]) -if test $sq_pathbar = yes; then - AC_DEFINE([ENABLE_PATHBAR], [1], [Define if we should include pathbar support]) -fi -AM_CONDITIONAL([ENABLE_PATHBAR], [test $sq_pathbar = yes]) - -AC_ARG_ENABLE([toolbar], - [AC_HELP_STRING([--disable-toolbar], -[Do not compile support for a ToolBar (default=enabled)])], -[sq_toolbar=$enableval], -[sq_toolbar=yes]) -if test $sq_toolbar = yes; then - AC_DEFINE([ENABLE_TOOLBAR], [1], [Define if we should include toolbar support]) -fi -AM_CONDITIONAL([ENABLE_TOOLBAR], [test $sq_toolbar = yes]) - AC_ARG_ENABLE([iter-slices], [AC_HELP_STRING([--disable-iter-slices], [Use LSQArchiveIter slices (default=enabled)])], diff --git a/src/Makefile.am b/src/Makefile.am index cdeef19..c41c273 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,25 +1,13 @@ bin_PROGRAMS = squeeze -if ENABLE_PATHBAR -PATHBAR_FILES = path_bar.c path_bar.h -else -PATHBAR_FILES = -endif - -if ENABLE_TOOLBAR -TOOLBAR_FILES = tool_bar.c tool_bar.h -else -TOOLBAR_FILES = -endif - squeeze_SOURCES = \ main.c main.h \ +path_bar.c path_bar.h \ +tool_bar.c tool_bar.h \ application.c application.h \ main_window.c main_window.h \ navigation_bar.c navigation_bar.h \ notebook.c notebook.h \ - $(TOOLBAR_FILES) \ - $(PATHBAR_FILES) \ settings.c settings.h \ archive_store.c archive_store.h \ message_dialog.c message_dialog.h \ @@ -28,7 +16,6 @@ squeeze_SOURCES = \ new_dialog.c new_dialog.h \ extract_dialog.c extract_dialog.h \ widget_factory.c widget_factory.h -# location_entry.c location_entry.h squeeze_CFLAGS = \ -DDATADIR=\$(datadir)\ \ @@ -57,12 +44,16 @@ INCLUDES = \ if MAINTAINER_MODE DISTCLEANFILES = \ - throbber-fallback.c + throbber-fallback.c \ + main_window_ui.h BUILT_SOURCES = \ - throbber-fallback.c + throbber-fallback.c \ + main_window_ui.h throbber-fallback.c: $(srcdir)/throbber-fallback.png Makefile (echo #include \throbber-fallback.h\ gdk-pixbuf-csource --extern --raw --stream --name=sq_throbber_fallback $(srcdir)/throbber-fallback.png) throbber-fallback.c +main_window_ui.h: main_window_ui.xml + xdt-csource --strip-comments --strip-content --static --name=main_window_ui $ $@ endif diff --git a/src/main_window.c b/src/main_window.c index 1b95e0d..cc87962 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -44,13 +44,8 @@ #include archive_store.h #include navigation_bar.h -#ifdef ENABLE_PATHBAR #include path_bar.h -#endif /* ENABLE_PATHBAR */ - -#ifdef ENABLE_TOOLBAR #include tool_bar.h -#endif /* ENABLE_TOOLBAR */ #include widget_factory.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] squeeze:stephan/ui Add missing files, update .po
Updating branch refs/heads/stephan/ui to 6d251ec9a5c1a5bd2791a2ca0b34dc7aa7b60dca (commit) from 032635ca610a3cd0d8ed8e61bdc92e160ea6b224 (commit) commit 6d251ec9a5c1a5bd2791a2ca0b34dc7aa7b60dca Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 18:01:42 2011 +0200 Add missing files, update .po src/main_window_ui.xml | 61 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/src/main_window_ui.xml b/src/main_window_ui.xml new file mode 100644 index 000..e5daa17 --- /dev/null +++ b/src/main_window_ui.xml @@ -0,0 +1,61 @@ +ui +!-- + + +-- +menubar name=main-menu +menu action=file-menu +menuitem action=new/ +menuitem action=open/ +placeholder name=placeholder-open-recent/ +separator/ +menuitem action=properties/ +menuitem action=close/ +menuitem action=quit/ +/menu +menu action=edit-menu +menu action=open-with-menu +placeholder name=open-with-apps / +/menu +separator/ +menuitem action=clear-private-data/ +menuitem action=preferences/ +/menu +menu action=view-menu +/menu +menu action=go-menu +menuitem action=add-file/ +menuitem action=add-folder/ +menuitem action=extract/ +menuitem action=remove/ +separator/ +menuitem action=refresh/ +/menu +menu action=help-menu +!-- +menuitem action=contents/ +-- +menuitem action=about/ +/menu +/menubar + +popup name=treeview-menu +separator/ +menu action=open-with-menu +placeholder name=open-with-apps / +/menu +separator/ +/popup + +toolbar name=file-toolbar +toolitem action=new/ +toolitem action=open/ +separator / +toolitem action=add-file/ +toolitem action=add-folder/ +toolitem action=extract/ +toolitem action=remove/ +separator / +toolitem action=stop/ +/toolbar +/ui ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Re-implement exif auto-rotation
Updating branch refs/heads/master to a7e517df26c36ccde58c4cb536007447214363c3 (commit) from 39f7d71c465a3131fc5922c1ef639be51d5dbb40 (commit) commit a7e517df26c36ccde58c4cb536007447214363c3 Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 19:43:35 2011 +0200 Re-implement exif auto-rotation NEWS |6 +++ src/file.c | 47 ++- src/file.h | 10 - src/image_list.c |1 + src/image_viewer.c | 103 +++--- src/image_viewer.h | 13 + src/main.c |1 + src/main_window.c| 37 --- src/properties_dialog.c |1 + src/thumbnail.c |1 + src/thumbnail_bar.c |1 + src/thumbnailer.c|1 + src/util.h | 37 +++ src/wallpaper_manager.c |1 + src/xfce_wallpaper_manager.c |1 + 15 files changed, 173 insertions(+), 88 deletions(-) diff --git a/NEWS b/NEWS index 5fb8690..1610a69 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +x.x.x += +- Re-introduce autorotation based on the exif-orientation tag, a + regression since 0.0.93 +- Prevent segmentation fault when an error occurs while loading an image + 0.2.0 = - Fix bug #6866 (Improve the sorting algorythm for filenames) diff --git a/src/file.c b/src/file.c index c4a4d83..24f5f59 100644 --- a/src/file.c +++ b/src/file.c @@ -25,6 +25,7 @@ #include libxfce4util/libxfce4util.h +#include util.h #include file.h static void @@ -100,6 +101,7 @@ struct _RsttoFilePriv gchar *path; ExifData *exif_data; +RsttoImageOrientation orientation; }; @@ -213,7 +215,6 @@ rstto_file_new ( GFile *file ) o_file-priv-file = file; g_object_ref (file); - open_files = g_list_append (open_files, o_file); return o_file; @@ -339,10 +340,9 @@ rstto_file_get_modified_time ( RsttoFile *file ) return time_; } -gchar * +ExifEntry * rstto_file_get_exif ( RsttoFile *file, ExifTag id ) { -gchar *val = NULL; ExifEntry *exif_entry = NULL; /* If there is no exif-data object, try to create it */ @@ -352,21 +352,42 @@ rstto_file_get_exif ( RsttoFile *file, ExifTag id ) } if ( NULL != file-priv-exif_data ) { -exif_entry = exif_data_get_entry ( +return exif_data_get_entry ( file-priv-exif_data, id ); -if ( NULL != exif_entry ) +} +return NULL; +} + +RsttoImageOrientation +rstto_file_get_orientation ( RsttoFile *file ) +{ +ExifEntry *exif_entry = NULL; +if (file-priv-orientation == 0 ) +{ +exif_entry = rstto_file_get_exif (file, EXIF_TAG_ORIENTATION); +if (NULL != exif_entry) { -switch ( id ) -{ -default: -val = g_new0 (gchar, 20); -exif_entry_get_value (exif_entry, val, 20); -break; -} +file-priv-orientation = exif_get_short ( +exif_entry-data, +exif_data_get_byte_order (exif_entry-parent-parent)); + +exif_entry_free (exif_entry); +} +if (file-priv-orientation == 0) +{ +/* Default orientation */ +file-priv-orientation = RSTTO_IMAGE_ORIENT_NONE; } } +return file-priv-orientation; +} -return val; +void +rstto_file_set_orientation ( +RsttoFile *file , +RsttoImageOrientation orientation ) +{ +file-priv-orientation = orientation; } diff --git a/src/file.h b/src/file.h index 9ace0de..e632b9a 100644 --- a/src/file.h +++ b/src/file.h @@ -86,9 +86,17 @@ rstto_file_get_content_type ( RsttoFile * ); guint64 rstto_file_get_modified_time ( RsttoFile *); -gchar * +ExifEntry * rstto_file_get_exif ( RsttoFile *, ExifTag ); +RsttoImageOrientation +rstto_file_get_orientation ( RsttoFile * ); + +void +rstto_file_set_orientation ( +RsttoFile * , +RsttoImageOrientation ); + G_END_DECLS diff --git a/src/image_list.c b/src/image_list.c index 1ee2179..ac1f291 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -28,6 +28,7 @@ #include libexif/exif-data.h +#include util.h #include file.h #include image_list.h #include settings.h diff --git a/src/image_viewer.c b/src/image_viewer.c index 5268f5a..64bc18a 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -23,6 +23,8 @@ #include gio/gio.h #include libexif/exif-data.h +#include util.h + #include file.h #include image_viewer.h #include settings.h @@ -56,7 +58,7 @@ struct _RsttoImageViewerPriv RsttoImageViewerTransaction *transaction; GdkPixbuf *pixbuf; GdkPixbuf *dst_pixbuf; -RsttoImageViewerOrientation orientation; +RsttoImageOrientationorientation; gdouble
[Xfce4-commits] ristretto:master l10n: Updated Spanish (Castilian) (es) translation to 93%
Updating branch refs/heads/master to 827b379251b2d979680497a1f467127e7ebb08f4 (commit) from a7e517df26c36ccde58c4cb536007447214363c3 (commit) commit 827b379251b2d979680497a1f467127e7ebb08f4 Author: Andres Sanchez afsanche...@gmail.com Date: Tue Oct 18 19:34:54 2011 +0200 l10n: Updated Spanish (Castilian) (es) translation to 93% New status: 118 messages complete with 8 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 26 ++ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/po/es.po b/po/es.po index 1e06d4a..ce8853b 100644 --- a/po/es.po +++ b/po/es.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 THE ristretto'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Abel Martín abel.martin.r...@gmail.com, 2008 -# +# msgid msgstr Project-Id-Version: ristretto\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2009-11-06 09:18-0300\n Last-Translator: elega el...@elega.com.ar\n Language-Team: Spanish xfce-i...@xfce.org\n -Language: es\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: es\n X-Poedit-Bookmarks: -1,-1,-1,-1,-1,84,11,-1,-1,-1\n #: ../src/main.c:57 @@ -62,11 +62,11 @@ msgstr Guardar una copia de la imagen #: ../src/main_window.c:283 msgid _Properties -msgstr +msgstr _Propiedades #: ../src/main_window.c:283 msgid Show file properties -msgstr +msgstr Mostrar propiedades del archivo #: ../src/main_window.c:284 msgid _Close @@ -379,8 +379,9 @@ msgid Background color msgstr Color de fondo #: ../src/preferences_dialog.c:195 +#, fuzzy msgid Toolbars -msgstr +msgstr Barras de herramientas #: ../src/preferences_dialog.c:200 msgid Override background color: @@ -467,32 +468,33 @@ msgstr Preferencias #: ../src/properties_dialog.c:152 msgid bName:/b -msgstr +msgstr bNombre:/b #: ../src/properties_dialog.c:153 msgid bKind:/b -msgstr +msgstr bTipo:/b #: ../src/properties_dialog.c:154 msgid bModified:/b -msgstr +msgstr bModificado:/b #: ../src/properties_dialog.c:155 +#, fuzzy msgid bAccessed:/b -msgstr +msgstr bFecha de consulta:/b #: ../src/properties_dialog.c:156 msgid bSize:/b -msgstr +msgstr bTamaño:/b #: ../src/properties_dialog.c:280 msgid General -msgstr +msgstr General #: ../src/properties_dialog.c:390 #, c-format msgid %s - Properties -msgstr +msgstr %s - Propiedades #: ../src/thumbnail_bar.c:193 msgid Spacing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master l10n: Updated Spanish (Castilian) (es) translation to 97%
Updating branch refs/heads/master to 96e1840d9917ce00173c7bd82b6d0551319ca8c2 (commit) from 827b379251b2d979680497a1f467127e7ebb08f4 (commit) commit 96e1840d9917ce00173c7bd82b6d0551319ca8c2 Author: Andres Sanchez afsanche...@gmail.com Date: Tue Oct 18 19:37:04 2011 +0200 l10n: Updated Spanish (Castilian) (es) translation to 97% New status: 123 messages complete with 3 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 17 ++--- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/po/es.po b/po/es.po index ce8853b..b4782ed 100644 --- a/po/es.po +++ b/po/es.po @@ -214,7 +214,7 @@ msgstr _Posición #: ../src/main_window.c:328 #, fuzzy msgid Thumbnailbar _Position -msgstr Miniaturas +msgstr Thumbnailbar _Position #. Misc #: ../src/main_window.c:330 @@ -340,7 +340,7 @@ msgstr ¿Está seguro de querer eliminar la imagen '%s' de su disco? #: ../src/privacy_dialog.c:151 #, fuzzy msgid Timerange to clear: -msgstr TimeRange para borrar: +msgstr TimeRange para aclarar: #: ../src/privacy_dialog.c:155 msgid Cleanup @@ -379,7 +379,6 @@ msgid Background color msgstr Color de fondo #: ../src/preferences_dialog.c:195 -#, fuzzy msgid Toolbars msgstr Barras de herramientas @@ -388,9 +387,8 @@ msgid Override background color: msgstr Reemplazar el color de fondo: #: ../src/preferences_dialog.c:211 -#, fuzzy msgid Merge toolbars -msgstr TimeRange para borrar: +msgstr Combinar las barras de herramientas #: ../src/preferences_dialog.c:239 msgid Slideshow @@ -454,9 +452,8 @@ msgid Startup msgstr Inicio #: ../src/preferences_dialog.c:311 -#, fuzzy msgid Maximize window on startup when opening an image -msgstr Redimensionar la ventana a la imagen al inicio +msgstr Maximizar la ventana de inicio al abrir una imagen #: ../src/preferences_dialog.c:317 msgid Wrap around images @@ -557,14 +554,12 @@ msgid Image Viewer msgstr Visor de imágenes #: ../ristretto.desktop.in.h:2 -#, fuzzy msgid Look at your images's easily -msgstr Mire su foto fácilmente +msgstr Mire sus imágenes fácilmente #: ../ristretto.desktop.in.h:3 -#, fuzzy msgid Ristretto Image Viewer -msgstr Visor de imágenes Ristretto +msgstr Visor de Imágenes Ristretto #~ msgid Open _Folder #~ msgstr Abrir _carpeta ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gigolo:master l10n: Updated Spanish (Castilian) (es) translation to 97%
Updating branch refs/heads/master to 9e622e96a3a2e3453066323b4b7a9d0f74bb7e8a (commit) from 30cd3f79432ea15b2a9cb9d0ab4c6fe87b9ea03a (commit) commit 9e622e96a3a2e3453066323b4b7a9d0f74bb7e8a Author: Andres Sanchez afsanche...@gmail.com Date: Tue Oct 18 19:38:06 2011 +0200 l10n: Updated Spanish (Castilian) (es) translation to 97% New status: 135 messages complete with 4 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 254 +++--- 1 files changed, 160 insertions(+), 94 deletions(-) diff --git a/po/es.po b/po/es.po index 3af95f8..bc46650 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: gigolo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-14 17:08+\n +POT-Creation-Date: 2011-10-18 16:03+\n PO-Revision-Date: 2009-12-14 18:29-0300\n Last-Translator: elega el...@elega.com.ar\n Language-Team: Spanish\n @@ -20,7 +20,8 @@ msgstr #: ../src/main.c:46 msgid Ignore running instances, enforce opening a new instance -msgstr Ignorar instancias en ejecución, forzar la apertura de una nueva instancia +msgstr +Ignorar instancias en ejecución, forzar la apertura de una nueva instancia #: ../src/main.c:47 msgid Print a list of supported URI schemes @@ -36,7 +37,9 @@ msgstr Mostrar información de versión #: ../src/main.c:79 msgid - a simple frontend to easily connect to remote filesystems -msgstr - una interfaz sencilla para conectarse fácilmente a sistemas de archivos remotos +msgstr +- una interfaz sencilla para conectarse fácilmente a sistemas de archivos +remotos #: ../src/common.c:77 msgid Unix Device @@ -70,7 +73,7 @@ msgstr WebDAV msgid WebDAV (secure) msgstr WebDAV (seguro) -#: ../src/common.c:93 ../src/window.c:1395 +#: ../src/common.c:93 ../src/window.c:1506 msgid Network msgstr Red @@ -86,163 +89,194 @@ msgstr Fotos msgid Custom Location msgstr Lugar personalizado -#: ../src/window.c:261 +#: ../src/window.c:262 #, c-format msgid Connecting to \%s\ msgstr Conectando a \%s\ -#: ../src/window.c:429 -msgid A simple frontend to easily connect/mount to local and remote filesystems -msgstr Una interfaz sencilla para conectarse fácilmente a sistemas de archivos locales y remotos - #: ../src/window.c:430 +msgid +A simple frontend to easily connect/mount to local and remote filesystems +msgstr +Una interfaz sencilla para conectarse fácilmente a sistemas de archivos +locales y remotos + +#: ../src/window.c:431 msgid Copyright 2008-2011 Enrico Tröger msgstr Copyright 2008-2009 Enrico Tröger -#: ../src/window.c:433 +#: ../src/window.c:434 msgid translator-credits msgstr Abel Martín abel.martin.r...@gmail.com \n elega el...@elega.com.ar -#: ../src/window.c:465 +#: ../src/window.c:466 msgid Gigolo can use the following protocols provided by GVfs: -msgstr Gigolo puede utilizar los siguientes protocolos proporcionados por GVfs: +msgstr +Gigolo puede utilizar los siguientes protocolos proporcionados por GVfs: -#: ../src/window.c:562 +#: ../src/window.c:579 ../src/window.c:638 #, c-format msgid The command '%s' failed msgstr La orden '%s' ha fallado -#: ../src/window.c:563 ../src/window.c:700 ../src/bookmarkeditdialog.c:220 +#: ../src/window.c:580 ../src/window.c:613 ../src/window.c:626 +#: ../src/window.c:639 ../src/window.c:797 ../src/bookmarkeditdialog.c:220 #: ../src/bookmarkeditdialog.c:239 ../src/bookmarkeditdialog.c:252 #: ../src/bookmarkeditdialog.c:263 ../src/bookmarkeditdialog.c:274 msgid Error msgstr Error #: ../src/window.c:613 +#, fuzzy +msgid Invalid terminal command +msgstr No válido comando en el terminal + +#: ../src/window.c:625 +#, c-format, fuzzy +msgid No default location available for \%s\ +msgstr No disponible para la ubicación por defecto \\ \% s \ + +#: ../src/window.c:705 msgid Edit _Bookmark msgstr Editar _marcador -#: ../src/window.c:615 ../src/window.c:1189 ../src/browsenetworkpanel.c:453 +#: ../src/window.c:707 ../src/window.c:1287 ../src/browsenetworkpanel.c:453 #: ../src/browsenetworkpanel.c:497 msgid Create _Bookmark msgstr Crear _marcadores -#: ../src/window.c:1181 +#: ../src/window.c:1279 msgid _File msgstr _Archivo -#: ../src/window.c:1182 +#: ../src/window.c:1280 msgid _Edit msgstr _Editar -#: ../src/window.c:1183 +#: ../src/window.c:1281 msgid _Actions msgstr A_cciones -#: ../src/window.c:1184 +#: ../src/window.c:1282 msgid _View msgstr _Ver -#: ../src/window.c:1185 +#: ../src/window.c:1283 msgid _Help msgstr A_yuda -#: ../src/window.c:1191 +#: ../src/window.c:1289 msgid _Edit Bookmarks msgstr _Editar marcadores -#: ../src/window.c:1192 +#: ../src/window.c:1290 msgid Open the bookmark manager to add, edit or delete bookmarks -msgstr Abrir el administrador de marcadores para añadir, editar o borrar marcadores +msgstr +Abrir el administrador de marcadores para añadir, editar o borrar
[Xfce4-commits] xfce4-dict:master l10n: Updated Spanish (Castilian) (es) translation to 100%
Updating branch refs/heads/master to 8002f1f78af1d474896855c8cb68b8caff2d3b7a (commit) from 546a55c43b0e368475b5c1c1d58446efe235b614 (commit) commit 8002f1f78af1d474896855c8cb68b8caff2d3b7a Author: Andres Sanchez afsanche...@gmail.com Date: Tue Oct 18 19:38:50 2011 +0200 l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 111 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 95 +- 1 files changed, 63 insertions(+), 32 deletions(-) diff --git a/po/es.po b/po/es.po index da1db0e..585b81e 100644 --- a/po/es.po +++ b/po/es.po @@ -7,13 +7,14 @@ msgid msgstr Project-Id-Version: xfce4-dict 0.5.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-14 17:02+\n +POT-Creation-Date: 2011-10-18 16:01+\n PO-Revision-Date: 2009-01-26 23:43+0100\n Last-Translator: Abel Martín abel.martin.r...@gmail.com\n Language-Team: Spanish xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: es\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1 @@ -21,13 +22,13 @@ msgid A plugin to query different dictionaries. msgstr Un complemento para consultar diferentes diccionarios. #: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2 -#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:628 ../lib/prefs.c:270 +#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:734 ../lib/prefs.c:270 msgid Dictionary msgstr Diccionario #: ../panel-plugin/xfce4-dict-plugin.c:347 #: ../panel-plugin/xfce4-dict-plugin.c:473 ../src/xfce4-dict.c:200 -#: ../lib/spell.c:243 ../lib/gui.c:411 +#: ../lib/spell.c:243 ../lib/gui.c:517 msgid Ready msgstr Listo @@ -35,7 +36,7 @@ msgstr Listo msgid Look up a word msgstr Buscar una palabra -#: ../panel-plugin/xfce4-dict-plugin.c:444 ../lib/gui.c:652 +#: ../panel-plugin/xfce4-dict-plugin.c:444 ../lib/gui.c:758 msgid Search term msgstr Término de búsqueda @@ -57,11 +58,14 @@ msgstr Obtener el foco en el campo de texto en el panel #: ../src/xfce4-dict.c:55 msgid Start stand-alone application even if the panel plugin is loaded -msgstr Iniciar como una aplicación independiente incluso si se carga el complemento del panel +msgstr +Iniciar como una aplicación independiente incluso si se carga el complemento +del panel #: ../src/xfce4-dict.c:56 msgid Grabs the PRIMARY selection content and uses it as search text -msgstr Toma el contenido de la selección PRIMARIA y lo usa como texto de búsqueda +msgstr +Toma el contenido de la selección PRIMARIA y lo usa como texto de búsqueda #: ../src/xfce4-dict.c:57 msgid Be verbose @@ -80,7 +84,7 @@ msgstr [TEXTO] msgid Please report bugs to %s. msgstr Por favor, informe de fallos a %s -#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:851 +#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:957 msgid A client program to query different dictionaries. msgstr Un programa cliente para consultar distintos diccionarios. @@ -123,7 +127,9 @@ msgstr Error en la ejecución de \%s\ (%s). #: ../lib/spell.c:202 msgid Please set the spell check command in the preferences dialog. -msgstr Por favor, configure el comando para el corrector ortográfico en el diálogo de preferencias. +msgstr +Por favor, configure el comando para el corrector ortográfico en el diálogo +de preferencias. #: ../lib/spell.c:208 ../lib/common.c:224 msgid Invalid input @@ -175,8 +181,13 @@ msgstr[0] (mostrar %d palabra al mismo tiempo) msgstr[1] (mostrar %d palabras al mismo tiempo) #: ../lib/speedreader.c:586 -msgid This is an easy speed reading utility to help train you to read faster. It does this by flashing words at a rapid rate on the screen. -msgstr Esto es una utilidad sencilla de lectura rápida para ayudarle a entrenar para leer más rápido. Lo hace haciendo parpadear palabras a una velocidad rápida en la pantalla. +msgid +This is an easy speed reading utility to help train you to read faster. It +does this by flashing words at a rapid rate on the screen. +msgstr +Esto es una utilidad sencilla de lectura rápida para ayudarle a entrenar +para leer más rápido. Lo hace haciendo parpadear palabras a una velocidad +rápida en la pantalla. #: ../lib/speedreader.c:589 msgid _Words per Minute: @@ -198,18 +209,21 @@ msgstr Tamaño de _letra: msgid Enter some text here you would like to read.\n \n -Be relaxed and make yourself comfortable, then press Start to begin speed reading. +Be relaxed and make yourself comfortable, then press Start to begin speed +reading. msgstr Introduzca aquí algún texto aquí quiera leer.\n \n -Relájese y póngase cómodo, entonces pulse Comenzar para empezar la lectura rápida. +Relájese y póngase cómodo, entonces pulse Comenzar para empezar la lectura +rápida. #: ../lib/speedreader.c:654 msgid Load the
[Xfce4-commits] orage:master l10n: Updated Spanish (Castilian) (es) translation to 99%
Updating branch refs/heads/master to 65d768e93b14424eead0e084640a7f92248fd1cd (commit) from 0bce566a0d9bac22f92701ba7a0b8620f04671a5 (commit) commit 65d768e93b14424eead0e084640a7f92248fd1cd Author: Andres Sanchez afsanche...@gmail.com Date: Tue Oct 18 19:39:06 2011 +0200 l10n: Updated Spanish (Castilian) (es) translation to 99% New status: 797 messages complete with 1 fuzzy and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/po/es.po b/po/es.po index ab67903..aaca342 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the orage package. # Edscott Wilson Garcia edsc...@xfce.org, 2004. # Abel Martín abel.martin.r...@gmail.com, 2008-2009. -# +# msgid msgstr Project-Id-Version: orage 4.3.90.2\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-03-19 16:41+0100\n Last-Translator: Abel Martín abel.martin.r...@gmail.com\n Language-Team: Spanish/ES xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../globaltime/globaltime.c:100 msgid Raising GlobalTime window... @@ -527,7 +527,7 @@ msgstr Preferencias de reloj de Oraje #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid %A %d %B %Y/%V msgstr %A %d %B %Y/%V @@ -931,6 +931,7 @@ msgstr Seleccione esta opción si desea una alarma mediante procedimiento o script #: ../src/appointment.c:3056 +#, fuzzy msgid You must enter all escape etc characters yourself.\n This string is just given to shell to process.\n @@ -940,7 +941,7 @@ msgid \tAT alarm time\n \tST appointment start time\n \tET appointment end time -msgstr +msgstr Usted debe ingresar todos los caracteres, etc escapar de ti mismo \\ cadena nEste acaba de dar a shell para procesar \\ nLos siguientes comandos especiales son reemplazados en tiempo de ejecución:.. \\ N \\ t lt;amp; Tgt; título de cita \\ n \\ t lt;+ Dgt; descripción de la cita \\ n \\ t lt;amp; Agt; hora de la alarma \\ n \\ t lt;amp; STgt; hora de inicio del nombramiento \\ n \\ t lt;amp; ETgt; nombramiento del tiempo del fin #: ../src/appointment.c:3068 msgid Test this alarm by raising it now @@ -981,7 +982,7 @@ msgstr Anual #: ../src/appointment.c:3150 msgid Hourly -msgstr +msgstr Cada hora #: ../src/appointment.c:3152 msgid Mon ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Try to improve the render-quality a bit
Updating branch refs/heads/master to ee7b5c7960301465e33e89a319e9751c6ad5a6e1 (commit) from 96e1840d9917ce00173c7bd82b6d0551319ca8c2 (commit) commit ee7b5c7960301465e33e89a319e9751c6ad5a6e1 Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 20:10:26 2011 +0200 Try to improve the render-quality a bit src/image_viewer.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 64bc18a..4a6319f 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1711,9 +1711,9 @@ cb_rstto_image_viewer_queued_repaint (RsttoImageViewer *viewer) subpixbuf_x_offset = (gint)(gtk_adjustment_get_value (hadjustment) / relative_scale); subpixbuf_y_offset = (gint)(gtk_adjustment_get_value (vadjustment) / relative_scale); -subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale) width)? +subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1 width)? (gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1:(width); -subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale) height)? +subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1 height)? (gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1:(height); break; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] moka:nick/maintainer-improvements Allow prepending other content to gitolite.conf.
Updating branch refs/heads/nick/maintainer-improvements to bc73cd4ee8ec6e61c036d185bb07cd747b01efdd (commit) from 0a2bfa581073c4836c653d7ad6cae63e41a30a89 (commit) commit bc73cd4ee8ec6e61c036d185bb07cd747b01efdd Author: Nick Schermer n...@xfce.org Date: Tue Oct 18 20:34:45 2011 +0200 Allow prepending other content to gitolite.conf. lib/helpers/gitolite.rb | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/lib/helpers/gitolite.rb b/lib/helpers/gitolite.rb index d16230b..41e9017 100644 --- a/lib/helpers/gitolite.rb +++ b/lib/helpers/gitolite.rb @@ -6,7 +6,7 @@ module Moka class Gitolite include Moka::Models -def run(gitolitedir) +def run(gitolitedir, prepend_files = nil) keydir = File.join(gitolitedir, keydir) File.makedirs(keydir) unless File.directory?(keydir) @@ -28,6 +28,14 @@ module Moka conf = # This file is generated by Moka\n\n + if prepend_files +for filename in prepend_files + file = File.new(filename, r) + file.each {|line| conf line } + file.close +end + end + for classification in Moka::Models::Classification.find_all.sort for project in classification.project_names.sort conf repo + classification.name + / + project + \n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto|ristretto-0.2.0 Creating annotated tag ristretto-0.2.0
Updating annotated tag refs/tags/ristretto-0.2.0 as new annotated tag to a8c0032af1b26740ef1adfb7f7f3343d345b9084 (tag) succeeds ristretto-0.1.1 tagged by Stephan Arts step...@xfce.org on 2011-10-17 17:31 +0200 Chipong Luo (2): l10n: Updated Chinese (China) (zh_CN) translation to 100% l10n: Updated Chinese (China) (zh_CN) translation to 100% Cristian Marchi (2): l10n: Updated Italian (it) translation to 100% l10n: Updated Italian (it) translation to 100% Masato Hashimoto (1): l10n: Updated Japanese (ja) translation to 100% Per Kongstad (2): l10n: Updated Danish (da) translation to 99% l10n: Updated Danish (da) translation to 100% Pjotr Anon (1): l10n: Updated Dutch (Flemish) (nl) translation to 100% Sergio Marques (3): l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% Stephan Arts (37): Add development tag Sort images in a way similar to Thunar (Bug #6866) Make open-entire-folder the default Set default thumbnail-bar location to the left Add option to merge the toolbars. Expand separator Set stock icon for set-wallpaper (Bug #8025) Hide thumbnailbar when no images are opened Add RsttoFile object Introduce a new folder-concept for opening files. Fix leakage of thumbnail-pixbuf Fix toolbar-visibility when unmerging toolbars Update NEWS Update TODO Improve thumbnail-selection procedure Improve sort functions update gitignore Fix bug in sorting algoritm (did not copy-paste enough from thunar) Improve merge-toolbar behaviour update TODO Remove debug statement Cleanup compiler warnings and errors Fix crash introduced with previous commit Update .po files Update TODO - Toolbar-merge is fixed Fix bug #7867 Improve placement of the set_page_size functions Make toolbar visible in fullscreen-mode when no image is loaded. reduce timeout to 500ms Improve fullscreen-behaviour Only emit the changes signal if it actually changed Fix error with current-uri Do not show thumbnailbar when leaving fullscreen Fix compile-issues failing make distcheck Update NEWS Set no_show_all on show-nav-toolbar menuitem Update version number Yarema aka Knedlyk (1): l10n: Updated Ukrainian (uk) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Rotate the thumbnails
Updating branch refs/heads/master to 1930b6b1d451e823e4e3b5919453ba57f559992d (commit) from ee7b5c7960301465e33e89a319e9751c6ad5a6e1 (commit) commit 1930b6b1d451e823e4e3b5919453ba57f559992d Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 20:46:40 2011 +0200 Rotate the thumbnails src/thumbnail.c | 35 +++ 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/thumbnail.c b/src/thumbnail.c index 649181b..f51af27 100644 --- a/src/thumbnail.c +++ b/src/thumbnail.c @@ -184,6 +184,7 @@ rstto_thumbnail_expose(GtkWidget *widget, GdkEventExpose *event) { RsttoThumbnail *thumb = RSTTO_THUMBNAIL(widget); GdkPixbuf *thumb_pixbuf = NULL; +GdkPixbuf *tmp_pixbuf = NULL; if (GTK_WIDGET_REALIZED (widget)) { @@ -209,18 +210,44 @@ rstto_thumbnail_expose(GtkWidget *widget, GdkEventExpose *event) gint width = gdk_pixbuf_get_width (thumb-priv-pixbuf) - 10; GdkPixbuf *dst_thumb_pixbuf = NULL; -if (gdk_pixbuf_get_width (thumb_pixbuf) gdk_pixbuf_get_height (thumb_pixbuf)) +switch (rstto_file_get_orientation (thumb-priv-file)) { -height = (gint)(((gdouble)gdk_pixbuf_get_height (thumb_pixbuf) / (gdouble)gdk_pixbuf_get_width (thumb_pixbuf)) * width); +case RSTTO_IMAGE_ORIENT_90: +tmp_pixbuf = gdk_pixbuf_rotate_simple ( +thumb_pixbuf, +GDK_PIXBUF_ROTATE_CLOCKWISE); +break; +case RSTTO_IMAGE_ORIENT_180: +tmp_pixbuf = gdk_pixbuf_rotate_simple ( +thumb_pixbuf, +GDK_PIXBUF_ROTATE_UPSIDEDOWN); +break; +case RSTTO_IMAGE_ORIENT_270: +tmp_pixbuf = gdk_pixbuf_rotate_simple ( +thumb_pixbuf, +GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); +break; +default: +tmp_pixbuf = thumb_pixbuf; +g_object_ref (tmp_pixbuf); +break; +} + +if (gdk_pixbuf_get_width (tmp_pixbuf) gdk_pixbuf_get_height (tmp_pixbuf)) +{ +height = (gint)(((gdouble)gdk_pixbuf_get_height (tmp_pixbuf) / (gdouble)gdk_pixbuf_get_width (tmp_pixbuf)) * width); } else { -width = (gint)(((gdouble)gdk_pixbuf_get_width (thumb_pixbuf) / (gdouble)gdk_pixbuf_get_height (thumb_pixbuf)) * height); +width = (gint)(((gdouble)gdk_pixbuf_get_width (tmp_pixbuf) / (gdouble)gdk_pixbuf_get_height (tmp_pixbuf)) * height); } gdk_pixbuf_fill (thumb-priv-pixbuf, 0x); -dst_thumb_pixbuf = gdk_pixbuf_scale_simple (thumb_pixbuf, width, height, GDK_INTERP_BILINEAR); +dst_thumb_pixbuf = gdk_pixbuf_scale_simple (tmp_pixbuf, width, height, GDK_INTERP_BILINEAR); + +g_object_unref (tmp_pixbuf); +tmp_pixbuf = NULL; gdk_pixbuf_copy_area (dst_thumb_pixbuf, 0, 0, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Converting more themes to Gtk 3
Updating branch refs/heads/peter/gtk3 to e40aac426d54806bd1965a7409e6d6abadd62ef0 (commit) from c770fd81eb3b659abfedc5d61e6c3200c894989c (commit) commit e40aac426d54806bd1965a7409e6d6abadd62ef0 Author: Peter de Ridder pe...@xfce.org Date: Tue Oct 18 21:31:43 2011 +0200 Converting more themes to Gtk 3 Xfce-cadmium, Xfce-curve configure.in.in |2 + themes/cadmium/Makefile.am|3 +- themes/{light = cadmium}/gtk-3.0/Makefile.am |2 +- themes/cadmium/gtk-3.0/gtk.css| 339 + themes/curve/Makefile.am |3 +- themes/{light = curve}/gtk-3.0/Makefile.am |2 +- themes/{smooth = curve}/gtk-3.0/gtk.css | 94 ++-- 7 files changed, 422 insertions(+), 23 deletions(-) diff --git a/configure.in.in b/configure.in.in index 3b02473..2417cf5 100644 --- a/configure.in.in +++ b/configure.in.in @@ -113,8 +113,10 @@ themes/xfce-4.6/gtk-2.0/Makefile themes/basic/gtk-2.0/Makefile themes/basic/Makefile themes/cadmium/gtk-2.0/Makefile +themes/cadmium/gtk-3.0/Makefile themes/cadmium/Makefile themes/curve/gtk-2.0/Makefile +themes/curve/gtk-3.0/Makefile themes/curve/Makefile themes/dawn/gtk-2.0/Makefile themes/dawn/Makefile diff --git a/themes/cadmium/Makefile.am b/themes/cadmium/Makefile.am index 8b23789..2ffbe0a 100644 --- a/themes/cadmium/Makefile.am +++ b/themes/cadmium/Makefile.am @@ -1,3 +1,4 @@ -SUBDIRS = gtk-2.0 +SUBDIRS = $(GTK_SUBDIRS) +DIST_SUBDIRS = gtk-2.0 gtk-3.0 themedir = $(datadir)/themes/Xfce-cadmium diff --git a/themes/light/gtk-3.0/Makefile.am b/themes/cadmium/gtk-3.0/Makefile.am similarity index 50% copy from themes/light/gtk-3.0/Makefile.am copy to themes/cadmium/gtk-3.0/Makefile.am index 60f0b49..42e966d 100644 --- a/themes/light/gtk-3.0/Makefile.am +++ b/themes/cadmium/gtk-3.0/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(datadir)/themes/Xfce-light/gtk-3.0 +themedir = $(datadir)/themes/Xfce-cadmium/gtk-3.0 theme_DATA = gtk.css EXTRA_DIST = $(theme_DATA) diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css new file mode 100644 index 000..d8be6b8 --- /dev/null +++ b/themes/cadmium/gtk-3.0/gtk.css @@ -0,0 +1,339 @@ + +@define-color fg_active #00; +@define-color fg_insensitive #8e8e8a; +@define-color fg_normal #00; +@define-color fg_prelight #00; +@define-color fg_selected #00; + +@define-color bg_active #cececa; +@define-color bg_insensitive #ef; +@define-color bg_normal #ef; +@define-color bg_prelight #ea; +@define-color bg_selected #ea; + +@define-color base_active #cececa; +@define-color base_insensitive #ef; +@define-color base_normal #ff; +@define-color base_prelight #d8dbe0; +@define-color base_selected #ea; + +@define-color text_active #00; +@define-color text_insensitive #00; +@define-color text_normal #00; +@define-color text_prelight #00; +@define-color text_selected #00; + +* { +engine: xfce; + +-xfce-smooth-edge: true; +-xfce-grip-style: disabled; + +-GtkButton-default-border: 0; +-GtkButton-default-outside-border: 0; +-GtkButton-child-displacement-x : 0; +-GtkButton-child-displacement-y : 1; +-GtkButton-default-spacing : 5; +-GtkWidget-focus-line-width : 1; +-GtkWidget-focus-padding : 2; +-GtkCheckButton-indicator-size : 12; +-GtkMenuBar-internal-padding : 0; +-GtkMenuBar-shadow-type : out; +/*GtkPaned::handle_full_size : 1*/ +-GtkPaned-handle-size: 7; +-GtkRange-slider-width : 12; +-GtkRange-stepper-size : 12; +-GtkRange-stepper-spacing: 0; +-GtkRange-trough-border : 0; +-GtkScrollbar-min-slider-length : 20; +-GtkToolBar-shadow-type : out; +-GtkWidget-interior-focus: 5; +-GtkWidget-internal-padding : 2; + +border-width: 2 2; + +color: @fg_normal; +background-color: @bg_normal; +border-color: darker(@bg_normal); +} + +*:active { +color: @fg_active; +background-color: @bg_active; +border-color: darker(@bg_active); +} + +*:insensitive { +color: @fg_insensitive; +background-color: @bg_insensitive; +border-color: darker(@bg_insensitive); +text-shadow: 1 1 white +} + +*:hover { +color: @fg_prelight; +background-color: @bg_prelight; +border-color: darker(@bg_prelight); +} + +*:selected { +color: @fg_selected; +background-color: @bg_selected; +border-color: darker(@bg_selected); +} + +.view, .entry { +color: @text_normal; +background-color: @base_normal; +border-color: darker(@bg_normal); +} + +.view:active, .entry:active { +color: @text_active; +background-color: @base_active; +border-color: darker(@bg_normal); +} + +.view:insensitive, .entry:insensitive { +color: @text_insensitive; +background-color: @base_insensitive; +
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Improved compatibility between Gtk 2 and Gtk 3 theme
Updating branch refs/heads/peter/gtk3 to c770fd81eb3b659abfedc5d61e6c3200c894989c (commit) from 5bec77f3d932c49e09700ff0293c25dd1d932874 (commit) commit c770fd81eb3b659abfedc5d61e6c3200c894989c Author: Peter de Ridder pe...@xfce.org Date: Tue Oct 18 21:29:28 2011 +0200 Improved compatibility between Gtk 2 and Gtk 3 theme Xfce-b5, Xfce-light, Xfce-saltlake, Xfce-smooth, Xfce-stellar themes/b5/gtk-3.0/gtk.css | 116 +++-- themes/light/gtk-3.0/gtk.css| 120 +-- themes/saltlake/gtk-3.0/gtk.css | 117 +++--- themes/smooth/gtk-3.0/gtk.css | 119 --- themes/stellar/gtk-3.0/gtk.css | 116 +++-- 5 files changed, 494 insertions(+), 94 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 80a3060..363f506 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -47,61 +47,120 @@ color: @fg_normal; background-color: @bg_normal; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; -border-color: shade(@bg_active, 0.7); +border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; -border-color: shade(@bg_insensitive, 0.7); +border-color: darker(@bg_insensitive); +text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; -border-color: shade(@bg_prelight, 0.7); +border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; -border-color: shade(@bg_selected, 0.7); +border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; -border-color: shade(@bg_normal, 0.7); +border-color: darker(@bg_normal); +} + +.view row:nth-child(odd) { +background-color: shade(@base_normal, 0.93); +} + +.view row:nth-child(odd):active { +background-color: shade(@base_active, 0.93); +} + +.view row:nth-child(odd):insensitive { +background-color: shade(@base_insensitive, 0.93); +} + +.view row:nth-child(odd):hover { +background-color: shade(@base_prelight, 0.93); +} + +.view row:nth-child(odd):selected { +background-color: shade(@base_selected, 0.93); +} + +GtkCalendar { +color: @text_normal; +} + +.button, .header { +color: @fg_normal; +} + +GtkCalendar:active { +color: @text_active; +} + +GtkCalendar:insensitive { +color: @text_insensitive; +} + +GtkCalendar:hover { +color: @text_prelight; +} + +GtkCalendar:selected { +color: @text_selected; +} + +.highlight { +color: @text_active; +background-color: @base_active; +} + +GtkCalendar:inconsistent { +color: mix(lighter(@bg_normal), darker(@bg_normal), 0.5); +} + +GtkCalendar:selected { +color: @text_active; +background-color: @base_active; } .check, .radio { @@ -154,31 +213,51 @@ color: @text_selected; } -/* -.spinbutton { +.spinbutton.button { color: @fg_normal; background-color: @bg_normal; } -*/ + +.spinbutton.button:active { +color: @fg_active; +background-color: @bg_active; +} + +.spinbutton.button:insensitive { +color: @fg_insensitive; +background-color: @bg_insensitive; +} + +.spinbutton.button:hover { +color: @fg_prelight; +background-color: @bg_prelight; +} + +.spinbutton.button:selected { +color: @fg_selected; +background-color: @bg_selected; +} .progressbar { background-color: @bg_prelight; +border-color: darker(@bg_prelight); } -.trough { +.scale.trough, .scrollbar.trough { background-color: @bg_active; +border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: @bg_active; -border-color: shade(@bg_active, 0.7); +border-color: darker(@bg_active); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: @bg_normal; -border-color: shade(@bg_normal, 0.7); +
[Xfce4-commits] squeeze:stephan/ui Add 16px svg
Updating branch refs/heads/stephan/ui to a9d377c478180d4ea1e7d9db9736d1c57e547419 (commit) from 442eb48c01d48d59dafdba9023cac66133754f09 (commit) commit a9d377c478180d4ea1e7d9db9736d1c57e547419 Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 21:39:46 2011 +0200 Add 16px svg icons/16x16/16.svg | 348 1 files changed, 348 insertions(+), 0 deletions(-) diff --git a/icons/16x16/16.svg b/icons/16x16/16.svg new file mode 100644 index 000..7a8ffd7 --- /dev/null +++ b/icons/16x16/16.svg @@ -0,0 +1,348 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://web.resource.org/cc/; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=16 + height=16 + id=svg2 + sodipodi:version=0.32 + inkscape:version=0.45+devel + sodipodi:docbase=/home/needcoffee/Templates + sodipodi:docname=16.svg + version=1.0 + inkscape:output_extension=org.inkscape.output.svg.inkscape + inkscape:export-filename=/media/Backup/Projekte/Icons/Tango/squeeze/16/squeeze.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 +linearGradient + id=linearGradient2816 + inkscape:collect=always + stop + id=stop2818 + offset=0 + style=stop-color:#edd400;stop-opacity:1 / + stop + id=stop2820 + offset=1 + style=stop-color:#ff;stop-opacity:1 / +/linearGradient +linearGradient + id=linearGradient12999 + stop + style=stop-color:#ff;stop-opacity:1; + offset=0 + id=stop13001 / + stop + style=stop-color:#ff;stop-opacity:0; + offset=1 + id=stop13003 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient12602 + stop + style=stop-color:#edd400;stop-opacity:1 + offset=0 + id=stop12604 / + stop + style=stop-color:#ec;stop-opacity:1 + offset=1 + id=stop12606 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient12213 + stop + style=stop-color:#fce94f;stop-opacity:1; + offset=0 + id=stop12215 / + stop + style=stop-color:#fce94f;stop-opacity:0; + offset=1 + id=stop12217 / +/linearGradient +linearGradient + id=linearGradient11435 + stop + id=stop11437 + offset=0 + style=stop-color:#fce94f;stop-opacity:1; / + stop + id=stop11439 + offset=1 + style=stop-color:#ff;stop-opacity:0; / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient9051 + stop + style=stop-color:#00;stop-opacity:1; + offset=0 + id=stop9053 / + stop + style=stop-color:#00;stop-opacity:0; + offset=1 + id=stop9055 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient7890 + stop + style=stop-color:#ff;stop-opacity:1 + offset=0 + id=stop7892 / + stop + style=stop-color:#73d216;stop-opacity:1 + offset=1 + id=stop7894 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient7501 + stop + style=stop-color:#4e9a06;stop-opacity:1; + offset=0 + id=stop7503 / + stop + style=stop-color:#73d216;stop-opacity:1 + offset=1 + id=stop7505 / +/linearGradient +linearGradient + id=linearGradient5127 + stop + style=stop-color:#d3d7cf;stop-opacity:1 + offset=0 + id=stop5129 / + stop + style=stop-color:#ff;stop-opacity:1 + offset=1 + id=stop5131 / +/linearGradient +linearGradient + id=linearGradient4738 + stop + style=stop-color:#ff;stop-opacity:1; + offset=0 + id=stop4740 / + stop + style=stop-color:#d3d7cf;stop-opacity:1 + offset=1 + id=stop4742 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient3557 + stop + style=stop-color:#fce94f;stop-opacity:1 + offset=0 + id=stop3559 / + stop + style=stop-color:#4e9a06;stop-opacity:1 + offset=1 + id=stop3561 / +/linearGradient +radialGradient + inkscape:collect=always + xlink:href=#linearGradient3557 + id=radialGradient7116 +
[Xfce4-commits] squeeze:stephan/ui Add missing icons
Updating branch refs/heads/stephan/ui to 51e29b51576a162a71f7e5bc26b0d43811d67be3 (commit) from a9d377c478180d4ea1e7d9db9736d1c57e547419 (commit) commit 51e29b51576a162a71f7e5bc26b0d43811d67be3 Author: Stephan Arts step...@xfce.org Date: Tue Oct 18 21:42:17 2011 +0200 Add missing icons icons/{scalable/squeeze.svg = 22x22/22.svg} | 124 +- icons/{16x16 = 22x22}/Makefile.am |2 +- icons/22x22/squeeze.png | Bin 0 - 1575 bytes icons/{scalable/squeeze.svg = 32x32/32.svg} | 77 +--- icons/{16x16 = 32x32}/Makefile.am |2 +- icons/32x32/squeeze.png | Bin 0 - 2710 bytes 6 files changed, 87 insertions(+), 118 deletions(-) diff --git a/icons/scalable/squeeze.svg b/icons/22x22/22.svg similarity index 54% copy from icons/scalable/squeeze.svg copy to icons/22x22/22.svg index ea99f85..5bf8dd7 100644 --- a/icons/scalable/squeeze.svg +++ b/icons/22x22/22.svg @@ -9,16 +9,16 @@ xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=48 - height=48 + width=22 + height=22 id=svg2 sodipodi:version=0.32 inkscape:version=0.45+devel sodipodi:docbase=/home/needcoffee/Templates - sodipodi:docname=squeeze.svg + sodipodi:docname=22.svg version=1.0 inkscape:output_extension=org.inkscape.output.svg.inkscape - inkscape:export-filename=/media/Backup/Projekte/Icons/Tango/squeeze/48/squeeze.png + inkscape:export-filename=/media/Backup/Projekte/Icons/Tango/squeeze/22/squeeze.png inkscape:export-xdpi=90 inkscape:export-ydpi=90 defs @@ -130,18 +130,6 @@ id=stop7505 / /linearGradient linearGradient - id=linearGradient7103 - inkscape:collect=always - stop - id=stop7105 - offset=0 - style=stop-color:#ff;stop-opacity:0.6 / - stop - id=stop7107 - offset=1 - style=stop-color:#ff;stop-opacity:1 / -/linearGradient -linearGradient id=linearGradient5127 stop style=stop-color:#d3d7cf;stop-opacity:1 @@ -192,7 +180,7 @@ xlink:href=#linearGradient3166 id=radialGradient7114 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1.323567,-0.6294416,0.3,0.6697538,-16.757446,26.868726) + gradientTransform=matrix(0.6448145,-0.3147208,0.1461539,0.3348769,-8.8561915,12.184363) cx=20.934795 cy=26.82947 fx=20.934795 @@ -203,7 +191,7 @@ xlink:href=#linearGradient3557 id=radialGradient7116 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1.299,0,0,1.001,-8.499,-0.503) + gradientTransform=matrix(0.634,0,0,0.5,-4.833,-1.502) cx=25 cy=19 fx=25 @@ -218,17 +206,7 @@ x2=4 y2=33 gradientUnits=userSpaceOnUse - gradientTransform=translate(0,1.998) / -linearGradient - inkscape:collect=always - xlink:href=#linearGradient7890 - id=linearGradient7896 - x1=10 - y1=2e-07 - x2=30 - y2=48 - gradientUnits=userSpaceOnUse - gradientTransform=translate(0,1.998) / + gradientTransform=matrix(0.4871795,0,0,0.499,-0.6923074,-0.251) / linearGradient inkscape:collect=always xlink:href=#linearGradient8660 @@ -238,7 +216,7 @@ x2=43 y2=25 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,1.0157725,0,2.326502) / + gradientTransform=matrix(0.4594594,0,0,0.4890757,-2.7026914e-2,0.1201682) / radialGradient inkscape:collect=always xlink:href=#linearGradient9051 @@ -259,17 +237,6 @@ x2=11.953227 y2=20.875582 gradientUnits=userSpaceOnUse / -radialGradient - inkscape:collect=always - xlink:href=#linearGradient9051 - id=radialGradient11830 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,0.25,0,28.5) - cx=25 - cy=38 - fx=25 - fy=38 - r=20 / linearGradient inkscape:collect=always xlink:href=#linearGradient12213 @@ -279,7 +246,7 @@ x2=24 y2=25.643581 gradientUnits=userSpaceOnUse - gradientTransform=matrix(0.9858906,0,0,0.9201532,0.4103068,3.4625008) / + gradientTransform=matrix(0.4550263,0,0,0.5175863,0.535526,-2.7085952) / linearGradient inkscape:collect=always xlink:href=#linearGradient2816 @@ -289,7 +256,7 @@ x2=15 y2=31 gradientUnits=userSpaceOnUse - gradientTransform=matrix(0.9858906,0,0,0.9832782,0.4103068,0.5100139) / + gradientTransform=matrix(0.4550263,0,0,0.5530941,0.535526,-4.369369) / linearGradient inkscape:collect=always xlink:href=#linearGradient12213
[Xfce4-commits] ristretto:master Decrease buffersize
Updating branch refs/heads/master to e49a5262732e31cdf4cba348212f099c4a620613 (commit) from 1930b6b1d451e823e4e3b5919453ba57f559992d (commit) commit e49a5262732e31cdf4cba348212f099c4a620613 Author: Stephan Arts step...@xfce.org Date: Wed Oct 19 06:46:42 2011 +0200 Decrease buffersize Some JPEG images cause the JPEG pixbufloader to fail if the buffer is too large. (Thanks to Michael Orlitzky mich...@orlitzky.com) src/image_viewer.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 4a6319f..e9cca8b 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -30,9 +30,11 @@ #include settings.h #include marshal.h +/* Do not make this buffer too large, + * this breaks some pixbufloaders. + */ #ifndef RSTTO_IMAGE_VIEWER_BUFFER_SIZE -/* #define RSTTO_IMAGE_VIEWER_BUFFER_SIZE 1024 */ -#define RSTTO_IMAGE_VIEWER_BUFFER_SIZE 131072 +#define RSTTO_IMAGE_VIEWER_BUFFER_SIZE 4096 #endif #ifndef RSTTO_MAX_SCALE ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits