[Xfce4-commits] l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 6a38bf12b0b06cff5333dba098612a260e4fdbd9 (commit) from 2017a8ebd37ad72c87a2c2ffd416d5c9cf038f46 (commit) commit 6a38bf12b0b06cff5333dba098612a260e4fdbd9 Author: Per Kongstad Date: Sun Nov 13 11:02:31 2011 +0100 l10n: Updated Danish (da) translation to 100% New status: 129 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 54 +- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/po/da.po b/po/da.po index 07b8558..861c63b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ristretto 0.0.90\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2011-11-11 05:05+\n" +"POT-Creation-Date: 2011-11-13 05:04+\n" "PO-Revision-Date: 2010-01-15 12:00+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -333,15 +333,19 @@ msgstr "Billeder" msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:2582 ../src/main_window.c:2706 +#: ../src/main_window.c:2584 ../src/main_window.c:2715 msgid "Could not open file" msgstr "Kunne ikke åbne fil" -#: ../src/main_window.c:2739 +#: ../src/main_window.c:2748 msgid "Save copy" msgstr "Gem kopi" -#: ../src/main_window.c:2849 +#: ../src/main_window.c:2774 +msgid "Could not save file" +msgstr "Kunne ikke gemme fil" + +#: ../src/main_window.c:2871 #, c-format msgid "Are you sure you want to delete image '%s' from disk?" msgstr "Er du sikker på, at du vil slette billedet '%s' fra disken?" @@ -462,46 +466,46 @@ msgstr "Svøb omkring billeder" msgid "Image Viewer Preferences" msgstr "Indstillinger for billedfremviser" -#: ../src/properties_dialog.c:181 +#: ../src/properties_dialog.c:180 msgid "Name:" msgstr "Navn:" -#: ../src/properties_dialog.c:182 +#: ../src/properties_dialog.c:181 msgid "Kind:" msgstr "Type:" -#: ../src/properties_dialog.c:183 +#: ../src/properties_dialog.c:182 msgid "Modified:" msgstr "Modificeret:" -#: ../src/properties_dialog.c:184 +#: ../src/properties_dialog.c:183 msgid "Accessed:" msgstr "Tilgået:" -#: ../src/properties_dialog.c:185 +#: ../src/properties_dialog.c:184 msgid "Size:" msgstr "Størrelse:" -#: ../src/properties_dialog.c:309 +#: ../src/properties_dialog.c:308 msgid "General" msgstr "Generelt" -#: ../src/properties_dialog.c:313 +#: ../src/properties_dialog.c:312 msgid "Image" msgstr "Billede" -#: ../src/properties_dialog.c:526 +#: ../src/properties_dialog.c:525 #, c-format msgid "Date taken:" msgstr "Taget på dato:" -#: ../src/properties_dialog.c:538 ../src/properties_dialog.c:550 -#: ../src/properties_dialog.c:562 +#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:561 #, c-format msgid "%s" msgstr "%s" -#: ../src/properties_dialog.c:624 +#: ../src/properties_dialog.c:623 #, c-format msgid "%s - Properties" msgstr "%s - Egenskaber" @@ -522,43 +526,43 @@ msgstr "kantbredde" msgid "the border width of the thumbnail-bar" msgstr "bredden af kanten rundt om miniaturebjælken" -#: ../src/xfce_wallpaper_manager.c:344 +#: ../src/xfce_wallpaper_manager.c:347 msgid "Style:" msgstr "Stil:" -#: ../src/xfce_wallpaper_manager.c:345 +#: ../src/xfce_wallpaper_manager.c:348 msgid "Brightness:" msgstr "Lysstyrke:" -#: ../src/xfce_wallpaper_manager.c:346 +#: ../src/xfce_wallpaper_manager.c:349 msgid "Saturation:" msgstr "Mætning:" -#: ../src/xfce_wallpaper_manager.c:363 +#: ../src/xfce_wallpaper_manager.c:366 msgid "Set as wallpaper" msgstr "Brug som skrivebordsbaggrund" -#: ../src/xfce_wallpaper_manager.c:521 +#: ../src/xfce_wallpaper_manager.c:524 msgid "Auto" msgstr "Automatisk" -#: ../src/xfce_wallpaper_manager.c:524 +#: ../src/xfce_wallpaper_manager.c:527 msgid "Centered" msgstr "Centreret" -#: ../src/xfce_wallpaper_manager.c:527 +#: ../src/xfce_wallpaper_manager.c:530 msgid "Tiled" msgstr "Fliselagt" -#: ../src/xfce_wallpaper_manager.c:530 +#: ../src/xfce_wallpaper_manager.c:533 msgid "Stretched" msgstr "Udstrukket" -#: ../src/xfce_wallpaper_manager.c:533 +#: ../src/xfce_wallpaper_manager.c:536 msgid "Scaled" msgstr "Skaleret" -#: ../src/xfce_wallpaper_manager.c:536 +#: ../src/xfce_wallpaper_manager.c:539 msgid "Zoomed" msgstr "Forstørret" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 9ec6c9b5d3c93c62591ba6922b2e2bb87b0edab3 (commit) from 6e24cbadb5592472a4abc51313e61c6375c7adf6 (commit) commit 9ec6c9b5d3c93c62591ba6922b2e2bb87b0edab3 Author: Per Kongstad Date: Sun Nov 13 11:05:43 2011 +0100 l10n: Updated Danish (da) translation to 100% New status: 25 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/da.po b/po/da.po index ea6f160..dba967f 100644 --- a/po/da.po +++ b/po/da.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2009-08-22 17:17+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" -"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "X-Poedit-Language: Danish\n" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: DENMARK\n" @@ -83,19 +83,19 @@ msgstr "tekst" #. text size option #: ../panel-plugin/xkb-settings-dialog.c:698 msgid "Text size:" -msgstr "" +msgstr "Tekst størrelse:" #: ../panel-plugin/xkb-settings-dialog.c:703 msgid "small" -msgstr "" +msgstr "lille" #: ../panel-plugin/xkb-settings-dialog.c:704 msgid "medium" -msgstr "" +msgstr "mellem" #: ../panel-plugin/xkb-settings-dialog.c:705 msgid "large" -msgstr "" +msgstr "stor" #: ../panel-plugin/xkb-settings-dialog.c:709 msgid "Manage layout:" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 95%
Updating branch refs/heads/master to 0f0a0eb19e210dc67014995e5a2245a0771da7ce (commit) from e728bd2be04148cca9e0aaea16635eab5ec71068 (commit) commit 0f0a0eb19e210dc67014995e5a2245a0771da7ce Author: Per Kongstad Date: Sun Nov 13 11:06:49 2011 +0100 l10n: Updated Danish (da) translation to 95% New status: 58 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index e024b0b..887e7d4 100644 --- a/po/da.po +++ b/po/da.po @@ -220,7 +220,6 @@ msgid "Regular expression" msgstr "Regulært udtryk" #: ../panel-plugin/settings-dialog.ui.h:27 -#, fuzzy msgid "Reverse order of the history shown in the menu" msgstr "" "Hvis afkrydset, vil denne indstilling gendanne historikken ved enhver ny " ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Handle ordering like mod_autoindex.
Updating branch refs/heads/master to d3282f858bbafd0605682b4cbc20ced0474df436 (commit) from a9d668779e6463870221d0d96c2981b75d3d8dac (commit) commit d3282f858bbafd0605682b4cbc20ced0474df436 Author: Nick Schermer Date: Sun Nov 13 13:01:42 2011 +0100 Handle ordering like mod_autoindex. fancyindex/main.rb | 22 ++ fancyindex/models/archive.rb |4 ++-- fancyindex/views/index.haml |6 +++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/fancyindex/main.rb b/fancyindex/main.rb index 8e5a7b7..e460190 100644 --- a/fancyindex/main.rb +++ b/fancyindex/main.rb @@ -23,18 +23,16 @@ module Fancyindex status 404 haml :notfound else -@order = params[:O] -reverse = false -if @order == 'A' - @order = 'D' -elsif @order == 'D' - @order = 'A' - reverse = true -else - @order = 'A' -end -#layout '*', :haml, { :format => :html5, :ugly => true } -@archive = Archive.new(path, requesturi, params[:C], reverse) +order = params[:O] +order = 'A' unless ['A', 'D'].include?(order) + +col = params[:C] +col = 'N' unless ['N', 'M', 'S'].include?(col) + +@dir = { 'N' => 'A', 'M' => 'A', 'S' => 'A' } +@dir.each {|c, o| @dir[c] = 'D' if col == c and order == o} + +@archive = Archive.new(path, requesturi, col, order == 'D') haml :index, :ugly => true end end diff --git a/fancyindex/models/archive.rb b/fancyindex/models/archive.rb index 5ff85db..78f828c 100644 --- a/fancyindex/models/archive.rb +++ b/fancyindex/models/archive.rb @@ -100,11 +100,11 @@ module Fancyindex def hreflink base = '/' -string = "archive.xfce.org/" +string = "archive.xfce.org" self.href.split('/').each do |part| next if part.empty? base += "#{part}/" - string += "#{part}/" + string += "/#{part}" end string end diff --git a/fancyindex/views/index.haml b/fancyindex/views/index.haml index 6e05e72..20208ac 100644 --- a/fancyindex/views/index.haml +++ b/fancyindex/views/index.haml @@ -38,11 +38,11 @@ %tr %th %th{:class => 'namecol'} -%a{:href => "?C=N;O=#{@order}"} Name +%a{:href => "?C=N;O=#{@dir['N']}"} Name %th -%a{:href => "?C=M;O=#{@order}"} Last modified +%a{:href => "?C=M;O=#{@dir['M']}"} Last modified %th -%a{:href => "?C=S;O=#{@order}"} Size +%a{:href => "?C=S;O=#{@dir['S']}"} Size %th - if @archive.parent %tr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Started on converting gradient themes to Gtk 3
Updating branch refs/heads/peter/gtk3 to 1fa76c110247ec0f456da415a7ef6530c37c48b4 (commit) from e40aac426d54806bd1965a7409e6d6abadd62ef0 (commit) commit 1fa76c110247ec0f456da415a7ef6530c37c48b4 Author: Peter de Ridder Date: Sun Nov 13 14:36:43 2011 +0100 Started on converting gradient themes to Gtk 3 Xfce-dawn, Xfce-dusk, Xfce-kde2, Xfce-kolors, Xfce-winter configure.in.in |5 + themes/dawn/Makefile.am |3 +- themes/{b5 => dawn}/gtk-3.0/Makefile.am |2 +- themes/{cadmium => dawn}/gtk-3.0/gtk.css | 140 ++-- themes/dusk/Makefile.am |3 +- themes/{b5 => dusk}/gtk-3.0/Makefile.am |2 +- themes/{cadmium => dusk}/gtk-3.0/gtk.css | 152 +++--- themes/kde2/Makefile.am |3 +- themes/{b5 => kde2}/gtk-3.0/Makefile.am |2 +- themes/{smooth => kde2}/gtk-3.0/gtk.css | 87 + themes/kolors/Makefile.am |3 +- themes/{smooth => kolors}/gtk-3.0/Makefile.am |2 +- themes/{cadmium => kolors}/gtk-3.0/gtk.css| 173 + themes/winter/Makefile.am |3 +- themes/{smooth => winter}/gtk-3.0/Makefile.am |2 +- themes/{cadmium => winter}/gtk-3.0/gtk.css| 171 +++-- 16 files changed, 421 insertions(+), 332 deletions(-) diff --git a/configure.in.in b/configure.in.in index 2417cf5..bae092d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -119,12 +119,16 @@ themes/curve/gtk-2.0/Makefile themes/curve/gtk-3.0/Makefile themes/curve/Makefile themes/dawn/gtk-2.0/Makefile +themes/dawn/gtk-3.0/Makefile themes/dawn/Makefile themes/dusk/gtk-2.0/Makefile +themes/dusk/gtk-3.0/Makefile themes/dusk/Makefile themes/kolors/gtk-2.0/Makefile +themes/kolors/gtk-3.0/Makefile themes/kolors/Makefile themes/kde2/gtk-2.0/Makefile +themes/kde2/gtk-3.0/Makefile themes/kde2/Makefile themes/light/Makefile themes/light/gtk-2.0/Makefile @@ -143,6 +147,7 @@ themes/stellar/gtk-2.0/Makefile themes/stellar/gtk-3.0/Makefile themes/stellar/Makefile themes/winter/gtk-2.0/Makefile +themes/winter/gtk-3.0/Makefile themes/winter/Makefile themes/Makefile ]) diff --git a/themes/dawn/Makefile.am b/themes/dawn/Makefile.am index 3237f52..3678158 100644 --- a/themes/dawn/Makefile.am +++ b/themes/dawn/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-dawn diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/dawn/gtk-3.0/Makefile.am similarity index 51% copy from themes/b5/gtk-3.0/Makefile.am copy to themes/dawn/gtk-3.0/Makefile.am index ee99671..0c75afe 100644 --- a/themes/b5/gtk-3.0/Makefile.am +++ b/themes/dawn/gtk-3.0/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(datadir)/themes/Xfce-b5/gtk-3.0 +themedir = $(datadir)/themes/Xfce-dawn/gtk-3.0 theme_DATA = gtk.css EXTRA_DIST = $(theme_DATA) diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css similarity index 64% copy from themes/cadmium/gtk-3.0/gtk.css copy to themes/dawn/gtk-3.0/gtk.css index d8be6b8..1a48901 100644 --- a/themes/cadmium/gtk-3.0/gtk.css +++ b/themes/dawn/gtk-3.0/gtk.css @@ -1,27 +1,27 @@ -@define-color fg_active #00; +@define-color fg_active #1f1f1f; @define-color fg_insensitive #8e8e8a; -@define-color fg_normal #00; +@define-color fg_normal #1f1f1f; @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 bg_active #bfbfbc; +@define-color bg_insensitive #ebe8e4; +@define-color bg_normal #ebe8e4; +@define-color bg_prelight #b0c0d0; +@define-color bg_selected #b0c0d0; -@define-color base_active #cececa; -@define-color base_insensitive #ef; +@define-color base_active #bfbfbc; +@define-color base_insensitive #ebe8e4; @define-color base_normal #ff; -@define-color base_prelight #d8dbe0; -@define-color base_selected #ea; +@define-color base_prelight #b0c0d0; +@define-color base_selected #699dc9; -@define-color text_active #00; -@define-color text_insensitive #00; -@define-color text_normal #00; +@define-color text_active #1f1f1f; +@define-color text_insensitive #1f1f1f; +@define-color text_normal #1f1f1f; @define-color text_prelight #00; -@define-color text_selected #00; +@define-color text_selected #ff; * { engine: xfce; @@ -33,22 +33,24 @@ -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; +-GtkButton-default-spacing : 8; -GtkCheckButton-indicator-size : 12;
[Xfce4-commits] Add MirrorBrain credits image.
Updating branch refs/heads/master to 66e6ecc1ff2736b8ceeb02f636ed73a65889709a (commit) from d3282f858bbafd0605682b4cbc20ced0474df436 (commit) commit 66e6ecc1ff2736b8ceeb02f636ed73a65889709a Author: Nick Schermer Date: Sun Nov 13 15:00:36 2011 +0100 Add MirrorBrain credits image. fancyindex/views/index.haml |5 ++--- mb_footer.html |4 +--- public/mb.png | Bin 0 -> 4421 bytes 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fancyindex/views/index.haml b/fancyindex/views/index.haml index 20208ac..1690bfd 100644 --- a/fancyindex/views/index.haml +++ b/fancyindex/views/index.haml @@ -66,7 +66,6 @@ - if href %a{:href => href} Details %hr - %div{:id => 'mirrorbrain-footer'} -Xfce download archive, powered by -%a{:href => 'http://mirrorbrain.org'} MirrorBrain + %a{:href => 'http://mirrorbrain.org', :title => 'Powered by MirrorBrain'} +%img{:src => '/public/mb.png', :alt => 'MirrorBrain', :border => 0} diff --git a/mb_footer.html b/mb_footer.html index f258578..49ec239 100644 --- a/mb_footer.html +++ b/mb_footer.html @@ -1,6 +1,4 @@ - - Xfce download archive, powered by http://mirrorbrain.org/";>MirrorBrain - + http://mirrorbrain.org/"; title="Powered by MirrorBrain"> diff --git a/public/mb.png b/public/mb.png new file mode 100644 index 000..f1031f9 Binary files /dev/null and b/public/mb.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Right align.
Updating branch refs/heads/master to f4ba4b31f565ed67510ec6231234687763b83fed (commit) from 66e6ecc1ff2736b8ceeb02f636ed73a65889709a (commit) commit f4ba4b31f565ed67510ec6231234687763b83fed Author: Nick Schermer Date: Sun Nov 13 15:03:05 2011 +0100 Right align. fancyindex/views/index.haml |3 +-- mb_footer.html |2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fancyindex/views/index.haml b/fancyindex/views/index.haml index 1690bfd..87d64eb 100644 --- a/fancyindex/views/index.haml +++ b/fancyindex/views/index.haml @@ -67,5 +67,4 @@ %a{:href => href} Details %hr %a{:href => 'http://mirrorbrain.org', :title => 'Powered by MirrorBrain'} -%img{:src => '/public/mb.png', :alt => 'MirrorBrain', :border => 0} - +%img{:src => '/public/mb.png', :alt => 'MirrorBrain', :border => 0, :align => 'right'} diff --git a/mb_footer.html b/mb_footer.html index 49ec239..2ab871f 100644 --- a/mb_footer.html +++ b/mb_footer.html @@ -1,4 +1,4 @@ - http://mirrorbrain.org/"; title="Powered by MirrorBrain"> + http://mirrorbrain.org/"; title="Powered by MirrorBrain"> ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove some unused css.
Updating branch refs/heads/nick/gettext to 284738e60b56a65f7204de9d1fe75da6764d9703 (commit) from 8c021a8c1e06e3a53e3f05aab0a2ea26c9e23089 (commit) commit 284738e60b56a65f7204de9d1fe75da6764d9703 Author: Nick Schermer Date: Sun Nov 13 15:05:04 2011 +0100 Remove some unused css. style/mirrorbrain.css | 14 -- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/style/mirrorbrain.css b/style/mirrorbrain.css index 5136a0c..34d3974 100644 --- a/style/mirrorbrain.css +++ b/style/mirrorbrain.css @@ -19,20 +19,6 @@ body { display: none; } -#mirrorbrain-footer { - color: #999; - font-size: small; -} - -#mirrorbrain-footer a { - color: #999; - text-decoration: underline; -} - -#mirrorbrain-footer a:hover { - color: #06c; -} - h2 { color: #666; border-bottom: 1px solid #ccc; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/gettext
Deleting branch refs/heads/nick/gettext ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove spec file and rpm build.
Updating branch refs/heads/master to a56684ae68e1bf781d9d54dcf189ce1286c4c363 (commit) from 310d65c7fa2ed9368cf082672c26f20ecc80c123 (commit) commit a56684ae68e1bf781d9d54dcf189ce1286c4c363 Author: Nick Schermer Date: Sun Nov 13 18:40:50 2011 +0100 Remove spec file and rpm build. Makefile.am |8 +- exo.spec.in | 80 --- 2 files changed, 1 insertions(+), 87 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5f7bbea..6190ca1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,11 +17,7 @@ AUTOMAKE_OPTIONS = \ no-dist-gzip distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog @@ -43,13 +39,11 @@ EXTRA_DIST = \ README \ THANKS \ TODO\ - exo.spec.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - exo.spec\ intltool-extract\ intltool-merge \ intltool-update diff --git a/exo.spec.in b/exo.spec.in deleted file mode 100644 index 11cd232..000 --- a/exo.spec.in +++ /dev/null @@ -1,80 +0,0 @@ -Summary: Application library for the Xfce desktop environment -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: LGPL -URL: http://libexo.os-cillation.com/ -Source0: %{name}-%{version}.tar.gz -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root -Requires: gtk2 >= @GTK_REQUIRED_VERSION@ -Requires: libxfce4util >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@ -BuildRequires: libxfce4util-devel >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: gtk-doc - -%description -Extension library for Xfce, targeted at application development. - -%package devel -Summary: Development files for the exo library -Group: Development/Libraries -Requires: @PACKAGE_TARNAME@@LIBEXO_VERSION_API@ >= @PACKAGE_VERSION@ - -%description devel -Static libraries and header files for the exo library. - -%prep -%setup -q - -%build -%configure --enable-final --enable-gtk-doc --enable-xsltproc -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} -mv $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/exo $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/exo-@LIBEXO_VERSION_API@ - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%files -%defattr(-,root,root) -%{_bindir}/exo-desktop-item-edit -%{_bindir}/exo-open -%{_bindir}/exo-preferred-applications -%{_datadir}/applications -%{_datadir}/icons -%{_datadir}/locale -%{_datadir}/pixmaps -%{_datadir}/xfce4 -%{_libdir}/lib*.so.* -%{_libdir}/xfce4 -%{_mandir}/man1/exo-open.* -%{_sysconfdir} - -%files devel -%defattr(-, root, root) -%{_bindir}/exo-csource -%{_datadir}/gtk-doc -%{_includedir} -%{_libdir}/lib*.so -%{_libdir}/lib*a -%{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/exo-csource.* - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Completely remove spec refs.
Updating branch refs/heads/master to 9bb6d752f31b13f5227aa4ddc554673b0c8eee96 (commit) from a56684ae68e1bf781d9d54dcf189ce1286c4c363 (commit) commit 9bb6d752f31b13f5227aa4ddc554673b0c8eee96 Author: Nick Schermer Date: Sun Nov 13 18:41:48 2011 +0100 Completely remove spec refs. configure.in.in |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 45117e5..1206753 100644 --- a/configure.in.in +++ b/configure.in.in @@ -292,7 +292,6 @@ docs/manual/images/sv/Makefile docs/manual/po/Makefile docs/reference/Makefile docs/reference/version.xml -exo.spec exo/Makefile exo/exo-1.pc exo/exo-config.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove spec file and rpm build.
Updating branch refs/heads/master to bcd3a0a0f134093bea0965deea2e017ccc6f445e (commit) from dd83dda06c2a2550608ddbab776d4d76b80c86b4 (commit) commit bcd3a0a0f134093bea0965deea2e017ccc6f445e Author: Nick Schermer Date: Sun Nov 13 18:44:30 2011 +0100 Remove spec file and rpm build. Makefile.am|8 +-- configure.ac.in|1 - libxfce4ui.spec.in | 61 3 files changed, 1 insertions(+), 69 deletions(-) diff --git a/Makefile.am b/Makefile.am index cac7c80..75713e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,11 +15,7 @@ AUTOMAKE_OPTIONS = \ no-dist-gzip distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog @@ -31,13 +27,11 @@ ChangeLog: Makefile dist-hook: ChangeLog EXTRA_DIST = \ - libxfce4ui.spec.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - libxfce4ui.spec \ intltool-extract \ intltool-merge \ intltool-update diff --git a/configure.ac.in b/configure.ac.in index 4ae5e21..ec0fa6c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -275,7 +275,6 @@ icons/Makefile icons/48x48/Makefile libxfce4kbd-private/libxfce4kbd-private-2.pc libxfce4kbd-private/Makefile -libxfce4ui.spec libxfce4ui/libxfce4ui-1.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile diff --git a/libxfce4ui.spec.in b/libxfce4ui.spec.in deleted file mode 100644 index c82a4ad..000 --- a/libxfce4ui.spec.in +++ /dev/null @@ -1,61 +0,0 @@ -Summary: Widgets library for the Xfce desktop environment -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: LGPL -URL: http://www.xfce.org/ -Source0: %{name}-%{version}.tar.gz -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root -Requires: glib2 >= @GOBJECT_REQUIRED_VERSION@ -Requires: gtk2 >= @GTK_REQUIRED_VERSION@ -Requires: libxfce4util >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: glib2-devel >= @GOBJECT_REQUIRED_VERSION@ -BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@ -BuildRequires: libxfce4util-devel >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: gtk-doc - -%description -Widgets and other frequently used functions for the Xfce desktop environment. - -%package devel -Summary: Development files for the libxfce4ui library -Group: Development/Libraries -Requires: @PACKAGE_TARNAME@@LIBXFCE4UI_VERSION_API@ >= @PACKAGE_VERSION@ - -%description devel -Static libraries and header files for the libxfce4ui library. - -%prep -%setup -q - -%build -%configure --enable-final --enable-gtk-doc -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root) -%{_libdir}/lib*.so.* -%{_sbindir}/* - -%files devel -%defattr(-, root, root) -%{_libdir}/lib*.so -%{_libdir}/*a -%{_libdir}/pkgconfig/*.pc -%{_includedir}/xfce4/libxfce4ui -%{_datadir}/gtk-doc - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove spec file and rpm build.
Updating branch refs/heads/master to a2f88abdc5fa7a459558e6ef50d094571a943a0b (commit) from 56cde58238898e5659c39f5e713ee0362ba772d9 (commit) commit a2f88abdc5fa7a459558e6ef50d094571a943a0b Author: Nick Schermer Date: Sun Nov 13 18:45:32 2011 +0100 Remove spec file and rpm build. Makefile.am |9 ++--- configure.in.in |1 - xfce4-dev-tools.spec.in | 34 -- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1a5a2cf..db3bf93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,11 +16,7 @@ AUTOMAKE_OPTIONS = \ dist-bzip2 distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog @@ -32,5 +28,4 @@ ChangeLog: Makefile dist-hook: ChangeLog EXTRA_DIST = \ - HACKING \ - xfce4-dev-tools.spec + HACKING diff --git a/configure.in.in b/configure.in.in index 76fabe3..033dbb8 100644 --- a/configure.in.in +++ b/configure.in.in @@ -68,7 +68,6 @@ dnl *** Generate files *** dnl ** AC_OUTPUT([ Makefile -xfce4-dev-tools.spec m4macros/Makefile scripts/Makefile scripts/xdt-autogen.in diff --git a/xfce4-dev-tools.spec.in b/xfce4-dev-tools.spec.in deleted file mode 100644 index 39e5d00..000 --- a/xfce4-dev-tools.spec.in +++ /dev/null @@ -1,34 +0,0 @@ -Summary: Xfce developer tools -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: GPL -URL: http://xfce.org/~benny/projects/xfce4-dev-tools/ -Source0: %{name}-%{version}.tar.gz -Group: Development/Tools -BuildRoot: %{_tmppath}/%{name}-root - -%description: -This package contains common tools required by Xfce developers and people -that want to build Xfce from SVN. In addition, this package contains the -Xfce developer's handbook. - -%prep -%setup -q - -%build -%configure -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README -%{_bindir}/ -%{_datadir}/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update build.
Updating branch refs/heads/master to dfd0dc48ef2d0dd8c3c771ccf69a4476534d6e34 (commit) from a2f88abdc5fa7a459558e6ef50d094571a943a0b (commit) commit dfd0dc48ef2d0dd8c3c771ccf69a4476534d6e34 Author: Nick Schermer Date: Sun Nov 13 18:47:53 2011 +0100 Update build. Makefile.am |3 ++- configure.in.in |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index db3bf93..c04c429 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ SUBDIRS = \ AUTOMAKE_OPTIONS = \ 1.8 \ - dist-bzip2 + dist-bzip2 \ + no-dist-gzip distclean-local: rm -rf *.cache *~ diff --git a/configure.in.in b/configure.in.in index 033dbb8..b2236c4 100644 --- a/configure.in.in +++ b/configure.in.in @@ -50,7 +50,8 @@ dnl AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() -AC_PROG_LIBTOOL() +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) dnl *** dnl *** Check for standard header files *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove spec file and rpm build.
Updating branch refs/heads/master to ba63a7b846760461023a28ef677b0bef209a17b0 (commit) from de3eaf2656fec23fffe3a572bebefa52bdc0590e (commit) commit ba63a7b846760461023a28ef677b0bef209a17b0 Author: Nick Schermer Date: Sun Nov 13 18:56:23 2011 +0100 Remove spec file and rpm build. Makefile.am | 12 configure.in.in |1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1f35613..1c0c8da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,14 +8,11 @@ SUBDIRS = \ AUTOMAKE_OPTIONS = \ 1.8 \ - dist-bzip2 + dist-bzip2 \ + no-dist-gzip distclean-local: - rm -rf libxfce4util.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog @@ -33,8 +30,7 @@ EXTRA_DIST = \ gtk-doc.make\ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - libxfce4util.spec + intltool-update.in DISTCLEANFILES = \ intltool-extract\ diff --git a/configure.in.in b/configure.in.in index 8c66464..9a4c4e3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -207,7 +207,6 @@ AC_OUTPUT([ Makefile docs/version.xml docs/Makefile -libxfce4util.spec libxfce4util/libxfce4util-1.0.pc libxfce4util/libxfce4util-config.h libxfce4util/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use new libtool macros.
Updating branch refs/heads/master to 4684ce68f4edc3e3d45f97716e6e922d898e3670 (commit) from ba63a7b846760461023a28ef677b0bef209a17b0 (commit) commit 4684ce68f4edc3e3d45f97716e6e922d898e3670 Author: Nick Schermer Date: Sun Nov 13 18:56:42 2011 +0100 Use new libtool macros. configure.in.in |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 9a4c4e3..1e0b78a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -89,9 +89,14 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() AC_PROG_INTLTOOL([0.31], [no-xml]) -AC_PROG_LIBTOOL() AC_CHECK_PROGS([PERL], [perl5 perl]) +dnl ** +dnl *** Initialize libtool *** +dnl ** +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl *** dnl *** Check for standard header files *** dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove spec file, rpm build and update libtool.
Updating branch refs/heads/master to add9df3e1945c4369a81260c74e45f1bed19788a (commit) from b41afa0c255c50d92025540fd072a642c2158d02 (commit) commit add9df3e1945c4369a81260c74e45f1bed19788a Author: Nick Schermer Date: Sun Nov 13 18:53:38 2011 +0100 Remove spec file, rpm build and update libtool. Makefile.am |8 +- Thunar.spec.in | 70 --- configure.in.in |7 ++--- 3 files changed, 4 insertions(+), 81 deletions(-) diff --git a/Makefile.am b/Makefile.am index 226de97..845e402 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,11 +29,7 @@ SUBDIRS = \ plugins distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog @@ -90,7 +86,6 @@ EXTRA_DIST = \ FAQ \ HACKING \ ThunarBulkRename.in \ - Thunar.spec.in \ ThunarHelp.in \ intltool-extract.in \ intltool-merge.in \ @@ -100,7 +95,6 @@ EXTRA_DIST = \ DISTCLEANFILES = \ ThunarBulkRename\ - Thunar.spec \ ThunarHelp \ intltool-extract\ intltool-merge \ diff --git a/Thunar.spec.in b/Thunar.spec.in deleted file mode 100644 index f3b01ab..000 --- a/Thunar.spec.in +++ /dev/null @@ -1,70 +0,0 @@ -Summary: Thunar File Manager -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: GPL -URL: http://thunar.xfce.org/ -Source0: %{name}-%{version}.tar.gz -Group: Applications/X11 -BuildRoot: %{_tmppath}/%{name}-root -Requires: fam -Requires: libexif -Requires: shared-mime-info >= 0.15 -Requires: desktop-file-utils >= 0.7 -Requires: exo1 >= @EXO_REQUIRED_VERSION@ -Requires: libxfce4ui >= @LIBXFCE4UI_REQUIRED_VERSION@ -Requires: startup-notification >= @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ -BuildRequires: fam-devel -BuildRequires: libjpeg-devel -BuildRequires: libexif-devel -BuildRequires: libpng-devel >= 2:1.2.2-16 -BuildRequires: desktop-file-utils >= 0.7 -BuildRequires: exo1-devel >= @EXO_REQUIRED_VERSION@ -BuildRequires: libxfce4ui-devel >= @LIBXFCE4UI_REQUIRED_VERSION@ -BuildRequires: startup-notification-devel >= @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ - -Provides: @PACKAGE_TARNAME@-devel - -%description -Thunar is a new modern file manager for the Xfce Desktop Environment. It has been designed from -the ground up to be fast and easy-to-use. Its user interface is clean and intuitive, and does not -include any confusing or useless options. Thunar is fast and responsive with a good start up time -and directory load time. - -%prep -%setup -q - -%build -%configure --enable-dbus --enable-final --enable-xsltproc -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%files -%defattr(-,root,root) -%doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS HACKING THANKS -%{_bindir}/ -%{_datadir}/ -%{_includedir}/ -%{_libdir}/ -%{_mandir}/ -%{_sysconfdir}/ diff --git a/configure.in.in b/configure.in.in index ceb575d..427d828 100644 --- a/configure.in.in +++ b/configure.in.in @@ -48,7 +48,7 @@ AC_REVISION([$Id$]) dnl *** dnl *** Initialize automake *** dnl *** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) +AM_INIT_A
[Xfce4-commits] Fix German manual translation.
Updating branch refs/heads/master to dbaddfcf6004ac951d539aa071b83d3eb82dd8f3 (commit) from add9df3e1945c4369a81260c74e45f1bed19788a (commit) commit dbaddfcf6004ac951d539aa071b83d3eb82dd8f3 Author: Nick Schermer Date: Sun Nov 13 18:59:41 2011 +0100 Fix German manual translation. docs/manual/po/de.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/manual/po/de.po b/docs/manual/po/de.po index efc9fc7..ae5aac1 100644 --- a/docs/manual/po/de.po +++ b/docs/manual/po/de.po @@ -11,7 +11,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: UTF-8\n" "Language: de\n" -"Plural-Forms: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. When image changes, this message will be marked fuzzy or untranslated for #. you. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove the spec file for real.
Updating branch refs/heads/master to 4ea1b99ce6fa7ea60a6c32835fc03b4329daf7fa (commit) from 4684ce68f4edc3e3d45f97716e6e922d898e3670 (commit) commit 4ea1b99ce6fa7ea60a6c32835fc03b4329daf7fa Author: Nick Schermer Date: Sun Nov 13 19:04:00 2011 +0100 Remove the spec file for real. libxfce4util.spec.in | 55 -- 1 files changed, 0 insertions(+), 55 deletions(-) diff --git a/libxfce4util.spec.in b/libxfce4util.spec.in deleted file mode 100644 index 58ce744..000 --- a/libxfce4util.spec.in +++ /dev/null @@ -1,55 +0,0 @@ -Summary: Utility library for the Xfce desktop environment -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: LGPL -URL: http://www.xfce.org/ -Source0: %{name}-%{version}.tar.gz -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root -Requires: glib2 >= @GOBJECT_REQUIRED_VERSION@ -BuildRequires: glib2-devel >= @GOBJECT_REQUIRED_VERSION@ -BuildRequires: gtk-doc - -%description -Basic utility non-GUI functions for the Xfce desktop environment. - -%package devel -Summary: developpment tools for libxfce4util library -Group: Development/Libraries -Requires: libxfce4util - -%description devel -Static libraries and header files for the libxfce4util library. - -%prep -%setup -q - -%build -%configure --enable-final --enable-gtk-doc -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%{_libdir}/lib*.so.* -%{_sbindir}/* - -%files devel -%defattr(-, root, root) -%{_libdir}/lib*.so -%{_libdir}/*a -%{_libdir}/pkgconfig/*.pc -%{_includedir}/xfce4/libxfce4util -%{_datadir}/gtk-doc - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 78%
Updating branch refs/heads/master to 68da9d38b7c2e3d7377525559b4b1db689b408c0 (commit) from 6a38bf12b0b06cff5333dba098612a260e4fdbd9 (commit) commit 68da9d38b7c2e3d7377525559b4b1db689b408c0 Author: Ivica Kolić Date: Sun Nov 13 20:56:09 2011 +0100 l10n: Updated Croatian (hr) translation to 78% New status: 101 messages complete with 0 fuzzies and 28 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 54 +- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/po/hr.po b/po/hr.po index ea2ba9b..b606dc6 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2011-11-04 23:05+\n" +"POT-Creation-Date: 2011-11-13 17:04+\n" "PO-Revision-Date: 2010-06-11 19:40+0200\n" "Last-Translator: Ivica Kolić <>\n" "Language-Team: Croatian <>\n" @@ -327,15 +327,19 @@ msgstr "Slike" msgid ".jp(e)g" msgstr ". Jp (e) g" -#: ../src/main_window.c:2582 ../src/main_window.c:2706 +#: ../src/main_window.c:2584 ../src/main_window.c:2715 msgid "Could not open file" msgstr "Ne mogu otvoriti datotewku" -#: ../src/main_window.c:2739 +#: ../src/main_window.c:2748 msgid "Save copy" msgstr "Spremi kopiju" -#: ../src/main_window.c:2849 +#: ../src/main_window.c:2774 +msgid "Could not save file" +msgstr "Ne mogu spremiti datoteku" + +#: ../src/main_window.c:2871 #, c-format msgid "Are you sure you want to delete image '%s' from disk?" msgstr "jeste li sigurni da želite izbrisati sliku '%s sa diska?" @@ -456,46 +460,46 @@ msgstr "Omotaj oko skika" msgid "Image Viewer Preferences" msgstr "Osobitosti preglednika slika" -#: ../src/properties_dialog.c:181 +#: ../src/properties_dialog.c:180 msgid "Name:" msgstr "" -#: ../src/properties_dialog.c:182 +#: ../src/properties_dialog.c:181 msgid "Kind:" msgstr "" -#: ../src/properties_dialog.c:183 +#: ../src/properties_dialog.c:182 msgid "Modified:" msgstr "" -#: ../src/properties_dialog.c:184 +#: ../src/properties_dialog.c:183 msgid "Accessed:" msgstr "" -#: ../src/properties_dialog.c:185 +#: ../src/properties_dialog.c:184 msgid "Size:" msgstr "" -#: ../src/properties_dialog.c:309 +#: ../src/properties_dialog.c:308 msgid "General" msgstr "" -#: ../src/properties_dialog.c:313 +#: ../src/properties_dialog.c:312 msgid "Image" msgstr "Slika" -#: ../src/properties_dialog.c:526 +#: ../src/properties_dialog.c:525 #, c-format msgid "Date taken:" msgstr "" -#: ../src/properties_dialog.c:538 ../src/properties_dialog.c:550 -#: ../src/properties_dialog.c:562 +#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:561 #, c-format msgid "%s" msgstr "" -#: ../src/properties_dialog.c:624 +#: ../src/properties_dialog.c:623 #, c-format msgid "%s - Properties" msgstr "%s - Svojstva" @@ -516,43 +520,43 @@ msgstr "širina ruba" msgid "the border width of the thumbnail-bar" msgstr "Širina ruba trake sličica" -#: ../src/xfce_wallpaper_manager.c:296 +#: ../src/xfce_wallpaper_manager.c:347 msgid "Style:" msgstr "Stil" -#: ../src/xfce_wallpaper_manager.c:297 +#: ../src/xfce_wallpaper_manager.c:348 msgid "Brightness:" msgstr "Osvijetljenost" -#: ../src/xfce_wallpaper_manager.c:298 +#: ../src/xfce_wallpaper_manager.c:349 msgid "Saturation:" msgstr "Zasićenost" -#: ../src/xfce_wallpaper_manager.c:315 +#: ../src/xfce_wallpaper_manager.c:366 msgid "Set as wallpaper" msgstr "" -#: ../src/xfce_wallpaper_manager.c:461 +#: ../src/xfce_wallpaper_manager.c:524 msgid "Auto" msgstr "" -#: ../src/xfce_wallpaper_manager.c:464 +#: ../src/xfce_wallpaper_manager.c:527 msgid "Centered" msgstr "Centrirano" -#: ../src/xfce_wallpaper_manager.c:467 +#: ../src/xfce_wallpaper_manager.c:530 msgid "Tiled" msgstr "" -#: ../src/xfce_wallpaper_manager.c:470 +#: ../src/xfce_wallpaper_manager.c:533 msgid "Stretched" msgstr "Rastegnuto" -#: ../src/xfce_wallpaper_manager.c:473 +#: ../src/xfce_wallpaper_manager.c:536 msgid "Scaled" msgstr "Skalirano" -#: ../src/xfce_wallpaper_manager.c:476 +#: ../src/xfce_wallpaper_manager.c:539 msgid "Zoomed" msgstr "Zumirano" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updates to Croatian translation
Updating branch refs/heads/master to 377982274a34fe492eddc9f42edddb769a8e9a92 (commit) from 2fd8f872ddc9c5c122aff3f6ebced9e13001aaab (commit) commit 377982274a34fe492eddc9f42edddb769a8e9a92 Author: Ivica Kolić Date: Sun Nov 13 21:27:26 2011 +0100 l10n: Updates to Croatian translation New status: 50 messages complete with 1 fuzzy and 47 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/hr.po | 120 ++- 1 files changed, 90 insertions(+), 30 deletions(-) diff --git a/doc/manual/po/hr.po b/doc/manual/po/hr.po index a56b192..ca4d81b 100644 --- a/doc/manual/po/hr.po +++ b/doc/manual/po/hr.po @@ -1,5 +1,5 @@ -#Croatian translations for xfce4-session-docs package. -#Copyright (C) 2003-2006 The Xfce development team. +# # Croatian translations for xfce4-session-docs package. +# Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the xfce4-session-docs package. # Ivica Kolić , 2011. # @@ -7,17 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-session-docs\n" "POT-Creation-Date: 2011-02-12 17:50+0100\n" -"PO-Revision-Date: 2011-11-12 19:08+0100\n" +"PO-Revision-Date: 2011-11-10 22:54+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Hrvatski <>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" "X-Poedit-Language: Croatian\n" "X-Poedit-Country: CROATIA\n" "X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: nplurals=3; \\ plural=n%10==1 && n%100!=11 ? 0 : \\\n" -" n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. @@ -44,7 +45,7 @@ msgstr "" #: xfce4-session.xml:14(title) msgid "Xfce 4 Session Manager" -msgstr "Xfce4 upravitelj sesijama" +msgstr "Xfce upravitelj sesijama" #: xfce4-session.xml:17(year) msgid "2003" @@ -82,19 +83,19 @@ msgstr "Meurer" #: xfce4-session.xml:48(jobtitle) msgid "Software developer" -msgstr "" +msgstr "Razvijatelj software-a" #: xfce4-session.xml:49(orgname) msgid "os-cillation" -msgstr "" +msgstr "os-cillation" #: xfce4-session.xml:50(orgdiv) msgid "System development" -msgstr "" +msgstr "Razvoj sustava" #: xfce4-session.xml:51(email) msgid "be...@xfce.org" -msgstr "" +msgstr "be...@xfce.org" #: xfce4-session.xml:56(releaseinfo) msgid "" @@ -103,7 +104,7 @@ msgstr "" #: xfce4-session.xml:65(title) msgid "Introduction" -msgstr "" +msgstr "Uvod" #: xfce4-session.xml:67(para) msgid "" @@ -112,6 +113,11 @@ msgid "" "location) and restore it during a next startup. You can create several " "different sessions and choose one of them on startup." msgstr "" +"@PACKAGE_NAME@ je upravitelj sesijama za Xfce 4." +"Njegov zadatak je spremiti stanje vašega zaslona (otvoreni programi i " +"njihove lokacije) i obnoviti ga tijekom slijedećeg pokretanja.Možete " +"napraviti nekoliko različitih sesija i izabrati jednu od njih prilikom " +"pokretanja." #: xfce4-session.xml:73(para) msgid "" @@ -128,35 +134,39 @@ msgstr "" #: xfce4-session.xml:84(title) msgid "Session Manager settings" -msgstr "" +msgstr "Postavke upravitelja sesijama" #: xfce4-session.xml:87(title) msgid "General preferences" -msgstr "" +msgstr "Osnovne osobitosti" #: xfce4-session.xml:90(title) msgid "@PACKAGE_NAME@ general preferences" -msgstr "" +msgstr "@PACKAGE_NAME@ osnovne osobitosti" #: xfce4-session.xml:98(phrase) msgid "" "Shows the General tab of the @PACKAGE_NAME@ " "settings dialog." msgstr "" +"Prikazuje Osnovnu karticu @PACKAGE_NAME@ dijaloga " +"postavki." #: xfce4-session.xml:106(term) msgid "Display chooser on login" -msgstr "" +msgstr "Prikaži izbor kod prijave" #: xfce4-session.xml:108(para) msgid "" "If set, the session manager will ask you to choose a session every time you " "log in to Xfce." msgstr "" +"Ako je postavljen,upravitelj sesijama će vas pitati da odaberete sesiju " +"svaki put kada se prijavite u Xfce." #: xfce4-session.xml:114(term) msgid "Automatically save session on logout" -msgstr "" +msgstr "Automatski spremi sesiju kod odjave" #: xfce4-session.xml:116(para) msgid "" @@ -164,10 +174,13 @@ msgid "" "automatically when you log out. If you don't select this option you'll be " "prompted whether you want to save the current session on each logout." msgstr "" +"Ova opcija upućuje upravitelja sesijama da automatski spremi trenutnu sesiju " +"kada se odjavite.Ako ne odaberete ovu opciju kod svake odjave će biti " +"tražena potvrda želite li spremiti trenutnu sesiju." #: xfce4-session.xml:124(term) msgid "Prompt on logout" -msgstr "" +msgstr "Traženje p
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 52%
Updating branch refs/heads/master to 452346453ba6169f677b93e0b27ee585767c1bcd (commit) from 377982274a34fe492eddc9f42edddb769a8e9a92 (commit) commit 452346453ba6169f677b93e0b27ee585767c1bcd Author: Ivica Kolić Date: Sun Nov 13 21:28:05 2011 +0100 l10n: Updated Croatian (hr) translation to 52% New status: 51 messages complete with 0 fuzzies and 47 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/hr.po | 215 ++- 1 files changed, 108 insertions(+), 107 deletions(-) diff --git a/doc/manual/po/hr.po b/doc/manual/po/hr.po index ca4d81b..4cc29ec 100644 --- a/doc/manual/po/hr.po +++ b/doc/manual/po/hr.po @@ -2,7 +2,7 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the xfce4-session-docs package. # Ivica Kolić , 2011. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-session-docs\n" @@ -10,60 +10,62 @@ msgstr "" "PO-Revision-Date: 2011-11-10 22:54+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Hrvatski <>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" +"Language: \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Croatian\n" -"X-Poedit-Country: CROATIA\n" "X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-Country: CROATIA\n" -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: xfce4-session.xml:94(None) +#: xfce4-session.xml94(None) msgid "" "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13" msgstr "" "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13" -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: xfce4-session.xml:142(None) +#: xfce4-session.xml142(None) msgid "" "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4" msgstr "" "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4" -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: xfce4-session.xml:205(None) +#: xfce4-session.xml205(None) msgid "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99" msgstr "" "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99" -#: xfce4-session.xml:14(title) +#: xfce4-session.xml14(title) msgid "Xfce 4 Session Manager" msgstr "Xfce upravitelj sesijama" -#: xfce4-session.xml:17(year) +#: xfce4-session.xml17(year) msgid "2003" msgstr "2003" -#: xfce4-session.xml:18(year) +#: xfce4-session.xml18(year) msgid "2004" msgstr "2004" -#: xfce4-session.xml:19(year) +#: xfce4-session.xml19(year) msgid "2005" msgstr "2005" -#: xfce4-session.xml:20(holder) +#: xfce4-session.xml20(holder) msgid "Benedikt Meurer" msgstr "Benedikt Meurer" -#: xfce4-session.xml:33(para) +#: xfce4-session.xml33(para) msgid "" "Permission is granted to copy, distribute and/or modify this document under " "the terms of the GNU Free Documentation License, Version 1.1 or any later " @@ -73,40 +75,40 @@ msgid "" "\"http://www.gnu.org/\";>Free Software Foundation." msgstr "" -#: xfce4-session.xml:45(firstname) +#: xfce4-session.xml45(firstname) msgid "Benedikt" msgstr "Benedikt" -#: xfce4-session.xml:46(surname) +#: xfce4-session.xml46(surname) msgid "Meurer" msgstr "Meurer" -#: xfce4-session.xml:48(jobtitle) +#: xfce4-session.xml48(jobtitle) msgid "Software developer" msgstr "Razvijatelj software-a" -#: xfce4-session.xml:49(orgname) +#: xfce4-session.xml49(orgname) msgid "os-cillation" msgstr "os-cillation" -#: xfce4-session.xml:50(orgdiv) +#: xfce4-session.xml50(orgdiv) msgid "System development" msgstr "Razvoj sustava" -#: xfce4-session.xml:51(email) +#: xfce4-session.xml51(email) msgid "be...@xfce.org" msgstr "be...@xfce.org" -#: xfce4-session.xml:56(releaseinfo) +#: xfce4-session.xml56(releaseinfo) msgid "" "This manual describes the @PACKAGE_NAME@ package, version @PACKAGE_VERSION@." msgstr "" -#: xfce4-session.xml:65(title) +#: xfce4-session.xml65(title) msgid "Introduction" msgstr "Uvod" -#: xfce4-session.xml:67(para) +#: xfce4-session.xml67(para) msgid "" "@PACKAGE_NAME@ is a session
[Xfce4-commits] Make sure the slideshow does not stop
Updating branch refs/heads/master to 9a72aee4ce0554bdab99ecf4e331fc93d6144d41 (commit) from 68da9d38b7c2e3d7377525559b4b1db689b408c0 (commit) commit 9a72aee4ce0554bdab99ecf4e331fc93d6144d41 Author: Stephan Arts Date: Thu Nov 3 23:22:57 2011 +0100 Make sure the slideshow does not stop - Make sure the slideshow does not stop if 'wrap around images' is disabled src/image_list.c | 22 -- src/image_list.h |6 -- src/main_window.c |8 +++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/image_list.c b/src/image_list.c index ac1f291..dabac2d 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -471,12 +471,13 @@ rstto_image_list_iter_set_position (RsttoImageListIter *iter, gint pos) g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL); } -void +gboolean rstto_image_list_iter_next (RsttoImageListIter *iter) { GList *position = NULL; RsttoSettings *settings = NULL; RsttoFile *file = iter->priv->file; +gboolean ret_val = FALSE; g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_PREPARE_CHANGE], 0, NULL); @@ -488,13 +489,25 @@ rstto_image_list_iter_next (RsttoImageListIter *iter) position = g_list_next (position); if (position) +{ iter->priv->file = position->data; + +/* We could move forward, set ret_val to TRUE */ +ret_val = TRUE; +} else { settings = rstto_settings_new(); if (rstto_settings_get_boolean_property (settings, "wrap-images")) +{ position = g_list_first (iter->priv->image_list->priv->images); + +/* We could move forward, wrapped back to the start of the + * list, set ret_val to TRUE + */ +ret_val = TRUE; +} else position = g_list_last (iter->priv->image_list->priv->images); @@ -510,14 +523,17 @@ rstto_image_list_iter_next (RsttoImageListIter *iter) { g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL); } + +return ret_val; } -void +gboolean rstto_image_list_iter_previous (RsttoImageListIter *iter) { GList *position = NULL; RsttoSettings *settings = NULL; RsttoFile *file = iter->priv->file; +gboolean ret_val = FALSE; g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_PREPARE_CHANGE], 0, NULL); @@ -553,6 +569,8 @@ rstto_image_list_iter_previous (RsttoImageListIter *iter) { g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL); } + +return ret_val; } RsttoImageListIter * diff --git a/src/image_list.h b/src/image_list.h index dac307d..5af86e5 100644 --- a/src/image_list.h +++ b/src/image_list.h @@ -115,8 +115,10 @@ GType rstto_image_list_iter_get_type (); RsttoFile * rstto_image_list_iter_get_file ( RsttoImageListIter *iter ); -voidrstto_image_list_iter_previous (RsttoImageListIter *iter); -voidrstto_image_list_iter_next (RsttoImageListIter *iter); +gboolean +rstto_image_list_iter_previous (RsttoImageListIter *iter); +gboolean +rstto_image_list_iter_next (RsttoImageListIter *iter); gintrstto_image_list_iter_get_position (RsttoImageListIter *iter); voidrstto_image_list_iter_set_position (RsttoImageListIter *iter, gint pos); diff --git a/src/main_window.c b/src/main_window.c index bc82518..13abc6e 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -2140,7 +2140,13 @@ cb_rstto_main_window_play_slideshow (RsttoMainWindow *window) { if (window->priv->playing) { -rstto_image_list_iter_next (window->priv->iter); +/* Check if we could navigate forward, if not, wrapping is + * disabled and we should force the iter to position 0 + */ +if (rstto_image_list_iter_next (window->priv->iter) == FALSE) +{ +rstto_image_list_iter_set_position (window->priv->iter, 0); +} } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add file monitor (Bug #6509)
Updating branch refs/heads/master to e9f758ce3daf3bff9e7c70e3e57edbb72236d948 (commit) from 9a72aee4ce0554bdab99ecf4e331fc93d6144d41 (commit) commit e9f758ce3daf3bff9e7c70e3e57edbb72236d948 Author: Stephan Arts Date: Thu Nov 10 22:29:36 2011 +0100 Add file monitor (Bug #6509) src/image_list.c | 89 ++-- src/main_window.c |6 +++ 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/src/image_list.c b/src/image_list.c index dabac2d..64b7308 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -40,6 +40,14 @@ rstto_image_list_class_init(RsttoImageListClass *); static void rstto_image_list_dispose(GObject *object); +static void +cb_file_monitor_changed ( +GFileMonitor *monitor, +GFile *file, +GFile *other_file, +GFileMonitorEvent event_type, +gpointer user_data ); + static void rstto_image_list_iter_init(RsttoImageListIter *); static void @@ -80,11 +88,13 @@ struct _RsttoImageListIterPriv struct _RsttoImageListPriv { -GList *images; -gint n_images; +GFileMonitor *monitor; -GSList *iterators; -GCompareFunc cb_rstto_image_list_compare_func; +GList*images; +gint n_images; + +GSList *iterators; +GCompareFunc cb_rstto_image_list_compare_func; }; static gint rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_COUNT]; @@ -320,6 +330,77 @@ rstto_image_list_remove_all (RsttoImageList *image_list) g_signal_emit (G_OBJECT (image_list), rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_REMOVE_ALL], 0, NULL); } +void +rstto_image_list_monitor_dir ( +RsttoImageList *image_list, +GFile *dir ) +{ +GFileMonitor *monitor = NULL; + +if ( NULL != image_list->priv->monitor ) +{ +g_object_unref (image_list->priv->monitor); +image_list->priv->monitor = NULL; +} + +monitor = g_file_monitor_directory ( +dir, +G_FILE_MONITOR_NONE, +NULL, +NULL); + +g_signal_connect ( +G_OBJECT(monitor), +"changed", +G_CALLBACK (cb_file_monitor_changed), +image_list); + +image_list->priv->monitor = monitor; +} + +static void +cb_file_monitor_changed ( +GFileMonitor *monitor, +GFile *file, +GFile *other_file, +GFileMonitorEvent event_type, +gpointer user_data ) +{ +RsttoImageList *image_list = RSTTO_IMAGE_LIST (user_data); +RsttoFile *r_file = rstto_file_new (file); + +g_return_if_fail ( monitor == image_list->priv->monitor); + +switch ( event_type ) +{ +case G_FILE_MONITOR_EVENT_DELETED: +g_debug("file deleted"); +rstto_image_list_remove_file ( image_list, r_file ); +r_file = NULL; +break; +case G_FILE_MONITOR_EVENT_CREATED: +g_debug("file created"); +rstto_image_list_add_file (image_list, r_file, NULL); +r_file = NULL; +break; +case G_FILE_MONITOR_EVENT_MOVED: +g_debug("file moved"); +rstto_image_list_remove_file ( image_list, r_file ); + +r_file = rstto_file_new (other_file); +rstto_image_list_add_file (image_list, r_file, NULL); +r_file = NULL; +break; +default: +break; +} + +if ( NULL != r_file ) +{ +g_object_unref (r_file); +} +} + GType diff --git a/src/main_window.c b/src/main_window.c index 13abc6e..4dde536 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -2641,6 +2641,9 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window) rfile ); } } +rstto_image_list_monitor_dir ( +window->priv->image_list, +p_file ); } g_value_set_string (¤t_uri_val, gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog))); @@ -2707,6 +2710,9 @@ cb_rstto_main_window_open_recent(GtkRecentChooser *chooser, RsttoMainWindow *win g_object_unref (file_enumerator); file_enumerator = NULL; } +rstto_image_list_monitor_dir ( +window->priv->image_list, +p_file ); rstto_image_list_iter_find_file ( window->priv->iter, rfile ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove new-image signal-handler, it has become obsolete.
Updating branch refs/heads/master to ec6c315c5b60dbb7ba230d1aeae11c88f6a524e3 (commit) from e9f758ce3daf3bff9e7c70e3e57edbb72236d948 (commit) commit ec6c315c5b60dbb7ba230d1aeae11c88f6a524e3 Author: Stephan Arts Date: Fri Nov 11 07:44:00 2011 +0100 Remove new-image signal-handler, it has become obsolete. src/main_window.c | 46 -- 1 files changed, 0 insertions(+), 46 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index 4dde536..1d4595b 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -157,12 +157,6 @@ static void cb_rstto_main_window_image_list_iter_changed (RsttoImageListIter *iter, RsttoMainWindow *window); static void -cb_rstto_main_window_image_list_new_image ( -RsttoImageList *image_list, -RsttoFile *file, -RsttoMainWindow *window ); - -static void cb_rstto_main_window_zoom_100 (GtkWidget *widget, RsttoMainWindow *window); static void cb_rstto_main_window_zoom_fit (GtkWidget *widget, RsttoMainWindow *window); @@ -837,11 +831,6 @@ rstto_main_window_new (RsttoImageList *image_list, gboolean fullscreen) window->priv->image_list = image_list; g_object_ref (image_list); -g_signal_connect ( -G_OBJECT (window->priv->image_list), -"new-image", -G_CALLBACK (cb_rstto_main_window_image_list_new_image), -window); window->priv->iter = rstto_image_list_get_iter (window->priv->image_list); g_signal_connect ( G_OBJECT (window->priv->iter), @@ -2259,41 +2248,6 @@ cb_rstto_main_window_quit (GtkWidget *widget, RsttoMainWindow *window) gtk_widget_destroy (GTK_WIDGET (window)); } -/** - * cb_rstto_main_window_image_list_new_image: - * @image_list: - * @image: - * @window: - * - */ -static void -cb_rstto_main_window_image_list_new_image ( -RsttoImageList *image_list, -RsttoFile *file, -RsttoMainWindow *window ) -{ -if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN )) -{ -gtk_widget_hide (window->priv->toolbar); -} -if (rstto_image_list_iter_get_position (window->priv->iter) == -1) -rstto_image_list_iter_set_position (window->priv->iter, 0); -if (window->priv->open_image_timer_id > 0) -{ -g_source_remove (window->priv->open_image_timer_id); -} -else -{ -rstto_image_list_iter_find_file (window->priv->iter, file); -rstto_main_window_image_list_iter_changed (window); -} - -rstto_main_window_update_buttons (window); - -window->priv->open_image_timer_id = g_timeout_add ( -1000, rstto_window_open_image_timer, window); -} - static gboolean cb_rstto_main_window_configure_event (GtkWidget *widget, GdkEventConfigure *event) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add definition in header-file image_list.h for function
Updating branch refs/heads/master to 9761249e25a0042974a06ab60a082c462c6eaef9 (commit) from ec6c315c5b60dbb7ba230d1aeae11c88f6a524e3 (commit) commit 9761249e25a0042974a06ab60a082c462c6eaef9 Author: Stephan Arts Date: Fri Nov 11 23:33:55 2011 +0100 Add definition in header-file image_list.h for function rstto_image_list_monitor_dir src/image_list.h |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/image_list.h b/src/image_list.h index 5af86e5..484cb96 100644 --- a/src/image_list.h +++ b/src/image_list.h @@ -98,6 +98,11 @@ RsttoImageList *rstto_image_list_new (); gint rstto_image_list_get_n_images (RsttoImageList *image_list); gboolean rstto_image_list_add_file (RsttoImageList *image_list, RsttoFile *file, GError **); +void +rstto_image_list_monitor_dir ( +RsttoImageList *image_list, +GFile *dir ); + GCompareFunc rstto_image_list_get_compare_func (RsttoImageList *image_list); void rstto_image_list_set_compare_func (RsttoImageList *image_list, GCompareFunc func); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove unused function rstto_window_open_image_timer
Updating branch refs/heads/master to 813c2cde1312e007c8c8aa57f9ed3a8625b72ac7 (commit) from 9761249e25a0042974a06ab60a082c462c6eaef9 (commit) commit 813c2cde1312e007c8c8aa57f9ed3a8625b72ac7 Author: Stephan Arts Date: Fri Nov 11 23:35:32 2011 +0100 Remove unused function rstto_window_open_image_timer src/main_window.c | 11 --- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index 1d4595b..e8e2742 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -70,7 +70,6 @@ struct _RsttoMainWindowPriv guint show_fs_toolbar_timeout_id; gint window_save_geometry_timer_id; -gint open_image_timer_id; gboolean fs_toolbar_sticky; @@ -142,8 +141,6 @@ key_press_event ( static gboolean rstto_window_save_geometry_timer (gpointer user_data); -static gboolean -rstto_window_open_image_timer(gpointer user_data); static void rstto_main_window_image_list_iter_changed (RsttoMainWindow *window); @@ -1601,14 +1598,6 @@ rstto_window_save_geometry_timer (gpointer user_data) return FALSE; } -static gboolean -rstto_window_open_image_timer (gpointer user_data) -{ -RsttoMainWindow *window = RSTTO_MAIN_WINDOW (user_data); -window->priv->open_image_timer_id = 0; -return FALSE; -} - static void rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint orientation) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add sticky bit, to prevent the iterators from jumping around.
Updating branch refs/heads/master to bd84c942674c5522ea94f6c49fbc27c08e390eda (commit) from 813c2cde1312e007c8c8aa57f9ed3a8625b72ac7 (commit) commit bd84c942674c5522ea94f6c49fbc27c08e390eda Author: Stephan Arts Date: Sat Nov 12 00:09:23 2011 +0100 Add sticky bit, to prevent the iterators from jumping around. src/image_list.c | 90 ++-- src/image_list.h |4 ++ src/main_window.c |1 + 3 files changed, 77 insertions(+), 18 deletions(-) diff --git a/src/image_list.c b/src/image_list.c index 64b7308..5484082 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -55,6 +55,20 @@ rstto_image_list_iter_class_init(RsttoImageListIterClass *); static void rstto_image_list_iter_dispose(GObject *object); +static gboolean +iter_next ( +RsttoImageListIter *iter, +gboolean sticky); +static gboolean +iter_previous ( +RsttoImageListIter *iter, +gboolean sticky); +static void +iter_set_position ( +RsttoImageListIter *iter, +gint pos, +gboolean sticky); + static RsttoImageListIter * rstto_image_list_iter_new (); static gint @@ -83,7 +97,10 @@ enum struct _RsttoImageListIterPriv { RsttoImageList *image_list; -RsttoFile *file; +RsttoFile *file; + +/* This is set if the iter-position is chosen by the user */ +gbooleansticky; }; struct _RsttoImageListPriv @@ -199,6 +216,7 @@ gboolean rstto_image_list_add_file (RsttoImageList *image_list, RsttoFile *file, GError **error) { GList *image_iter = g_list_find (image_list->priv->images, file); +GSList *iter = image_list->priv->iterators; if (!image_iter) { @@ -209,15 +227,15 @@ rstto_image_list_add_file (RsttoImageList *image_list, RsttoFile *file, GError * image_list->priv->n_images++; g_signal_emit (G_OBJECT (image_list), rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_NEW_IMAGE], 0, file, NULL); -if (image_list->priv->n_images == 1) +/** TODO: update all iterators */ +while (iter) { -/** TODO: update all iterators */ -GSList *iter = image_list->priv->iterators; -while (iter) +if (FALSE == RSTTO_IMAGE_LIST_ITER(iter->data)->priv->sticky) { -g_signal_emit (G_OBJECT (iter->data), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL); -iter = g_slist_next (iter); +g_debug("find file"); +rstto_image_list_iter_find_file (iter->data, file); } +iter = g_slist_next (iter); } return TRUE; } @@ -274,11 +292,11 @@ rstto_image_list_remove_file (RsttoImageList *image_list, RsttoFile *file) { if (rstto_image_list_iter_get_position (iter->data) == rstto_image_list_get_n_images (image_list)-1) { -rstto_image_list_iter_previous (iter->data); +iter_previous (iter->data, FALSE); } else { -rstto_image_list_iter_next (iter->data); +iter_next (iter->data, FALSE); } /* If the image is still the same, * it's a single item list, @@ -302,7 +320,7 @@ rstto_image_list_remove_file (RsttoImageList *image_list, RsttoFile *file) { if (rstto_file_equal(afile, file)) { -rstto_image_list_iter_next (iter->data); +iter_next (iter->data, FALSE); } } iter = g_slist_next (iter); @@ -324,7 +342,7 @@ rstto_image_list_remove_all (RsttoImageList *image_list) iter = image_list->priv->iterators; while (iter) { -rstto_image_list_iter_set_position (iter->data, -1); +iter_set_position (iter->data, -1, FALSE); iter = g_slist_next (iter); } g_signal_emit (G_OBJECT (image_list), rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_REMOVE_ALL], 0, NULL); @@ -386,7 +404,6 @@ cb_file_monitor_changed ( case G_FILE_MONITOR_EVENT_MOVED: g_debug("file moved"); rstto_image_list_remove_file ( image_list, r_file ); - r_file = rstto_file_new (other_file); rstto_image_list_add_file (image_list, r_file, NULL); r_file = NULL; @@ -509,6 +526,7 @@ rstto_image_list_iter_find_file (RsttoImageListIter *iter, RsttoFile *file) iter->priv->file = NULL; } iter->priv->file = file; +iter->priv->sticky = TRUE; g_signal_emit (G_OBJECT (iter), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL); @@ -533,9 +551,11 @@ rstto_image_list_iter_get_file (RsttoImageListI
[Xfce4-commits] Implement the folder-concept introduced in 0.2.0 in the image-list.
Updating branch refs/heads/master to 91ac881276b68c2e50874c2c0d7de01fee443913 (commit) from bd84c942674c5522ea94f6c49fbc27c08e390eda (commit) commit 91ac881276b68c2e50874c2c0d7de01fee443913 Author: Stephan Arts Date: Sat Nov 12 08:24:39 2011 +0100 Implement the folder-concept introduced in 0.2.0 in the image-list. This removed the need for code-duplication, and reduces the chances of bugs being introduced. src/image_list.c | 90 +++-- src/image_list.h | 22 - src/main_window.c | 80 +- 3 files changed, 102 insertions(+), 90 deletions(-) diff --git a/src/image_list.c b/src/image_list.c index 5484082..2a5eb89 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -55,14 +55,25 @@ rstto_image_list_iter_class_init(RsttoImageListIterClass *); static void rstto_image_list_iter_dispose(GObject *object); +static void +rstto_image_list_monitor_dir ( +RsttoImageList *image_list, +GFile *dir ); + +static void +rstto_image_list_remove_all ( +RsttoImageList *image_list); + static gboolean iter_next ( RsttoImageListIter *iter, gboolean sticky); + static gboolean iter_previous ( RsttoImageListIter *iter, gboolean sticky); + static void iter_set_position ( RsttoImageListIter *iter, @@ -232,7 +243,6 @@ rstto_image_list_add_file (RsttoImageList *image_list, RsttoFile *file, GError * { if (FALSE == RSTTO_IMAGE_LIST_ITER(iter->data)->priv->sticky) { -g_debug("find file"); rstto_image_list_iter_find_file (iter->data, file); } iter = g_slist_next (iter); @@ -331,7 +341,7 @@ rstto_image_list_remove_file (RsttoImageList *image_list, RsttoFile *file) } } -void +static void rstto_image_list_remove_all (RsttoImageList *image_list) { GSList *iter = NULL; @@ -348,7 +358,52 @@ rstto_image_list_remove_all (RsttoImageList *image_list) g_signal_emit (G_OBJECT (image_list), rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_REMOVE_ALL], 0, NULL); } -void +gboolean +rstto_image_list_set_directory ( +RsttoImageList *image_list, +GFile *dir, +GError **error ) +{ +/* Declare variables */ +GFileEnumerator *file_enumerator = NULL; +GFileInfo *file_info; +const gchar *filename; +const gchar *content_type; +GFile *child_file; + +/* Source code block */ +rstto_image_list_remove_all (image_list); + +/* Allow all images to be removed by providing NULL to dir */ +if ( NULL != dir ) +{ +file_enumerator = g_file_enumerate_children (dir, "standard::*", 0, NULL, NULL); + +if (NULL != file_enumerator) +{ +for(file_info = g_file_enumerator_next_file (file_enumerator, NULL, NULL); +NULL != file_info; +file_info = g_file_enumerator_next_file (file_enumerator, NULL, NULL)) +{ +filename = g_file_info_get_name (file_info); +content_type = g_file_info_get_content_type (file_info); +child_file = g_file_get_child (dir, filename); +if (strncmp (content_type, "image/", 6) == 0) +{ +rstto_image_list_add_file (image_list, rstto_file_new (child_file), NULL); +} +} +g_object_unref (file_enumerator); +file_enumerator = NULL; +} +} + +rstto_image_list_monitor_dir ( image_list, dir ); + +return TRUE; +} + +static void rstto_image_list_monitor_dir ( RsttoImageList *image_list, GFile *dir ) @@ -361,17 +416,21 @@ rstto_image_list_monitor_dir ( image_list->priv->monitor = NULL; } -monitor = g_file_monitor_directory ( -dir, -G_FILE_MONITOR_NONE, -NULL, -NULL); - -g_signal_connect ( -G_OBJECT(monitor), -"changed", -G_CALLBACK (cb_file_monitor_changed), -image_list); +/* Allow a monitor to be removed by providing NULL to dir */ +if ( NULL != dir ) +{ +monitor = g_file_monitor_directory ( +dir, +G_FILE_MONITOR_NONE, +NULL, +NULL); + +g_signal_connect ( +G_OBJECT(monitor), +"changed", +G_CALLBACK (cb_file_monitor_changed), +image_list); +} image_list->priv->monitor = monitor; } @@ -392,17 +451,14 @@ cb_file_monitor_changed ( switch ( event_type ) { case G_FILE_MONITOR_EVENT_DELETED: -g_debug("file deleted"); rstto_image_list_remove_file ( image_list, r_file ); r_file = NULL; break; case G_FILE_MONITOR_EVENT_CREAT
[Xfce4-commits] Make sure the iterator points to a file when a few files are opened.
Updating branch refs/heads/master to 3e660107ad30b12a2b5262e6f78f042517eccdc4 (commit) from 91ac881276b68c2e50874c2c0d7de01fee443913 (commit) commit 3e660107ad30b12a2b5262e6f78f042517eccdc4 Author: Stephan Arts Date: Sat Nov 12 08:53:47 2011 +0100 Make sure the iterator points to a file when a few files are opened. src/main_window.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index 9e971fe..49c212c 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -2541,6 +2541,9 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window) _files_iter = g_slist_next (_files_iter); } +rstto_image_list_iter_set_position ( +window->priv->iter, +0); } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use new API for opening a directory in main.c also.
Updating branch refs/heads/master to 06f6a1867ddb20de0af2dea3a993c7f793999250 (commit) from 3e660107ad30b12a2b5262e6f78f042517eccdc4 (commit) commit 06f6a1867ddb20de0af2dea3a993c7f793999250 Author: Stephan Arts Date: Sun Nov 13 22:13:17 2011 +0100 Use new API for opening a directory in main.c also. Use the new API, rstto_image_list_set_directory from main.c, this requires the introduction of rstto_main_window_get_iter, to get the iterator used by the main-window. This iterator is needed to make sure the main-window shows the correct image. src/main.c| 55 +--- src/main_window.c |7 ++ src/main_window.h |7 +- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/main.c b/src/main.c index 0794838..f550a44 100644 --- a/src/main.c +++ b/src/main.c @@ -101,7 +101,14 @@ main(int argc, char **argv) { if (cli_error != NULL) { -g_print (_("%s: %s\nTry %s --help to see a full list of available command line options.\n"), PACKAGE, cli_error->message, PACKAGE_NAME); +g_print ( +_("%s: %s\n\n" + "Try %s --help to see a full list of\n" + "available command line options.\n"), +PACKAGE, +cli_error->message, +PACKAGE_NAME); + g_error_free (cli_error); return 1; } @@ -170,11 +177,11 @@ static gboolean cb_rstto_open_files (RsttoOpenFiles *rof) { GFileType file_type; -GFile *file, *p_file, *child_file; +GFile *file, *p_file; GFileInfo *file_info; -const gchar *content_type, *filename; - -GFileEnumerator *file_enumarator = NULL; +RsttoFile *r_file = NULL; +RsttoImageListIter *iter = NULL; +const gchar *content_type; if (rof->argc > 2) { @@ -212,35 +219,35 @@ cb_rstto_open_files (RsttoOpenFiles *rof) file_info = g_file_query_info (file, "standard::content-type,standard::type", 0, NULL, NULL); if (file_info) { -content_type = g_file_info_get_attribute_string (file_info, "standard::content-type"); file_type = g_file_info_get_file_type (file_info); +content_type = g_file_info_get_attribute_string (file_info, "standard::content-type"); if (strncmp (content_type, "image/", 6) == 0) { -if (rstto_image_list_add_file (rof->image_list, rstto_file_new(file), NULL) == TRUE) -{ -rstto_main_window_add_file_to_recent_files (file); -} +r_file = rstto_file_new (file); +} +else +{ +/* TODO: show error dialog */ } } } -if (file_type != G_FILE_TYPE_DIRECTORY) { -p_file = g_file_get_parent (file); -file_enumarator = g_file_enumerate_children (p_file, "standard::*", 0, NULL, NULL); -for(file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL); file_info != NULL; file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL)) + +if (file_type != G_FILE_TYPE_DIRECTORY && r_file != NULL) { -filename = g_file_info_get_name (file_info); -content_type = g_file_info_get_content_type (file_info); -child_file = g_file_get_child (p_file, filename); +/* Get the iterator used by the main-window, it should be + * set to point to the right file later. + */ +iter = rstto_main_window_get_iter (RSTTO_MAIN_WINDOW (rof->window)); -if (strncmp (content_type, "image/", 6) == 0) -{ -rstto_image_list_add_file (rof->image_list, rstto_file_new(child_file), NULL); -} +/* Get the file's parent directory */ +p_file = g_file_get_parent (file); -g_object_unref (child_file); -g_object_unref (file_info); -} +/* Open the directory */ +rstto_image_list_set_directory (rof->image_list, p_file, NULL); + +/* Point the iterator to the correct image */ +rstto_image_list_iter_find_file (iter, r_file); } } return FALSE; diff --git a/src/main_window.c b/src/main_window.c index 49c212c..ad19462 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -2872,6 +2872,13 @@ cb_rstto_main_window_toggle_show_thumbnailbar (GtkWidget *widget, RsttoMainWindo } } +RsttoImageListIter * +rstto_main_window_get_iter ( +RsttoMainWindow *window) +{ +return window->priv->iter; +} + gboolean rstto_main_window_add_file_to_recent_files (GFile *file) { diff --git a/src/main_window.h b/src/main_window.h index 8a724f5..9e5819d
[Xfce4-commits] Remove main.h (file is empty)
Updating branch refs/heads/master to ae0fdea54f0f0d4cb558a93961cd42c62fc61d78 (commit) from 654fefa69e04d64279f738fc4e3cff45f004242b (commit) commit ae0fdea54f0f0d4cb558a93961cd42c62fc61d78 Author: Stephan Arts Date: Sun Nov 13 23:02:08 2011 +0100 Remove main.h (file is empty) 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main.h b/src/main.h deleted file mode 100644 index e69de29..000 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add 'iter_has_next' and 'iter_has_previous' functions,
Updating branch refs/heads/master to 654fefa69e04d64279f738fc4e3cff45f004242b (commit) from 06f6a1867ddb20de0af2dea3a993c7f793999250 (commit) commit 654fefa69e04d64279f738fc4e3cff45f004242b Author: Stephan Arts Date: Sun Nov 13 22:52:13 2011 +0100 Add 'iter_has_next' and 'iter_has_previous' functions, - iter_has_next and iter_has_previous can be used to disable the sensitivity of the 'back' button on the first image. - idem for the 'forward' button on the last image. src/image_list.c | 126 +++- src/image_list.h |5 ++ src/main_window.c | 44 +-- 3 files changed, 158 insertions(+), 17 deletions(-) diff --git a/src/image_list.c b/src/image_list.c index 2a5eb89..db0b521 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -56,6 +56,12 @@ static void rstto_image_list_iter_dispose(GObject *object); static void +cb_rstto_wrap_images_changed ( +GObject *settings, +GParamSpec *pspec, +gpointer user_data); + +static void rstto_image_list_monitor_dir ( RsttoImageList *image_list, GFile *dir ); @@ -117,12 +123,15 @@ struct _RsttoImageListIterPriv struct _RsttoImageListPriv { GFileMonitor *monitor; +RsttoSettings *settings; GList*images; gint n_images; GSList *iterators; GCompareFunc cb_rstto_image_list_compare_func; + +gboolean wrap_images; }; static gint rstto_image_list_signals[RSTTO_IMAGE_LIST_SIGNAL_COUNT]; @@ -159,7 +168,20 @@ rstto_image_list_init(RsttoImageList *image_list) { image_list->priv = g_new0 (RsttoImageListPriv, 1); +image_list->priv->settings = rstto_settings_new (); + image_list->priv->cb_rstto_image_list_compare_func = (GCompareFunc)cb_rstto_image_list_image_name_compare_func; + +image_list->priv->wrap_images = rstto_settings_get_boolean_property ( +image_list->priv->settings, +"wrap-images"); + +g_signal_connect ( +G_OBJECT(image_list->priv->settings), +"notify::wrap-images", +G_CALLBACK (cb_rstto_wrap_images_changed), +image_list); + } static void @@ -210,7 +232,18 @@ rstto_image_list_class_init(RsttoImageListClass *nav_class) static void rstto_image_list_dispose(GObject *object) { -/*RsttoImageList *image_list = RSTTO_IMAGE_LIST(object);*/ +RsttoImageList *image_list = RSTTO_IMAGE_LIST(object); +if (NULL != image_list->priv) +{ +if (image_list->priv->settings) +{ +g_object_unref (image_list->priv->settings); +image_list->priv->settings = NULL; +} + +g_free (image_list->priv); +image_list->priv = NULL; +} } RsttoImageList * @@ -640,7 +673,7 @@ iter_next ( gboolean sticky) { GList *position = NULL; -RsttoSettings *settings = NULL; +RsttoImageList *image_list = iter->priv->image_list; RsttoFile *file = iter->priv->file; gboolean ret_val = FALSE; @@ -664,9 +697,8 @@ iter_next ( } else { -settings = rstto_settings_new(); -if (rstto_settings_get_boolean_property (settings, "wrap-images")) +if (TRUE == image_list->priv->wrap_images) { position = g_list_first (iter->priv->image_list->priv->images); @@ -682,8 +714,6 @@ iter_next ( iter->priv->file = position->data; else iter->priv->file = NULL; - -g_object_unref (settings); } if (file != iter->priv->file) @@ -700,13 +730,36 @@ rstto_image_list_iter_next (RsttoImageListIter *iter) return iter_next (iter, TRUE); } +gboolean +rstto_image_list_iter_has_next (RsttoImageListIter *iter) +{ +RsttoImageList *image_list = iter->priv->image_list; + +if (image_list->priv->wrap_images) +{ +return TRUE; +} +else +{ +if (rstto_image_list_iter_get_position (iter) == +(rstto_image_list_get_n_images (image_list) -1)) +{ +return FALSE; +} +else +{ +return TRUE; +} +} +} + static gboolean iter_previous ( RsttoImageListIter *iter, gboolean sticky) { GList *position = NULL; -RsttoSettings *settings = NULL; +RsttoImageList *image_list = iter->priv->image_list; RsttoFile *file = iter->priv->file; gboolean ret_val = FALSE; @@ -727,19 +780,23 @@ iter_previous ( } else { -settings = rstto_settings_new(); - -if (rstto_settings_get_boolean_property (settings, "wrap-images")) +if (TRUE == image_list->priv->wrap_images) +{ position = g_list_last (iter->priv->image_list->priv->images); +} else +{ position = g_list_first (iter->priv->image_list->priv->images); +} if (position) +{ iter->priv-
[Xfce4-commits] Update NEWS
Updating branch refs/heads/master to e43a58fe207c161faecf9bcb8e0099680fa62198 (commit) from ae0fdea54f0f0d4cb558a93961cd42c62fc61d78 (commit) commit e43a58fe207c161faecf9bcb8e0099680fa62198 Author: Stephan Arts Date: Sun Nov 13 23:04:39 2011 +0100 Update NEWS NEWS |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 76bea24..b6e4357 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ x.x.x paint_background_icon tries to use a NULL bg_icon) - Fix bug #8135 (Fix compile with --enable-debug=full) - Do not open the copy of an image when saving. +- Fix bug #6509 (Implement file-monitor) +- Add 'has-next' and 'has-previous' functions to disable the sensitivity + of the 'back' and 'forward' buttons when showing the first or last + image in a list. 0.3.0 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Plug memory-leak
Updating branch refs/heads/master to 30ae66b39617bf5b2628827a9598bdf35e746e5a (commit) from e43a58fe207c161faecf9bcb8e0099680fa62198 (commit) commit 30ae66b39617bf5b2628827a9598bdf35e746e5a Author: Stephan Arts Date: Sun Nov 13 23:15:08 2011 +0100 Plug memory-leak src/image_viewer.c | 26 ++ 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 30a7ab3..ff20e3d 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -529,15 +529,25 @@ rstto_image_viewer_destroy(GtkObject *object) { RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER(object); -if (viewer->priv->settings) +if (viewer->priv) { -g_object_unref (viewer->priv->settings); -viewer->priv->settings = NULL; -} -if (viewer->priv->bg_icon) -{ -g_object_unref (viewer->priv->bg_icon); -viewer->priv->bg_icon = NULL; +if (viewer->priv->settings) +{ +g_object_unref (viewer->priv->settings); +viewer->priv->settings = NULL; +} +if (viewer->priv->bg_icon) +{ +g_object_unref (viewer->priv->bg_icon); +viewer->priv->bg_icon = NULL; +} +if (viewer->priv->pixbuf) +{ +g_object_unref (viewer->priv->pixbuf); +viewer->priv->pixbuf = NULL; +} +g_free (viewer->priv); +viewer->priv = NULL; } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve preview of wallpaper for zoomed, scaled and stretched view.
Updating branch refs/heads/master to 51052132ec4fe62e2f5b706dc3fb088f36d7b3c4 (commit) from 30ae66b39617bf5b2628827a9598bdf35e746e5a (commit) commit 51052132ec4fe62e2f5b706dc3fb088f36d7b3c4 Author: Stephan Arts Date: Mon Nov 14 00:11:47 2011 +0100 Improve preview of wallpaper for zoomed, scaled and stretched view. src/monitor_chooser.c | 24 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c index f8bb6d1..c01f3f1 100644 --- a/src/monitor_chooser.c +++ b/src/monitor_chooser.c @@ -412,8 +412,8 @@ paint_monitor ( cairo_t *cr, switch (monitor->style) { case MONITOR_STYLE_STRETCHED: -hscale = (width) / (gdk_pixbuf_get_width(monitor->pixbuf)); -vscale = (height) / (gdk_pixbuf_get_height(monitor->pixbuf)); +hscale = (width-20) / (gdk_pixbuf_get_width(monitor->pixbuf)); +vscale = (height-20) / (gdk_pixbuf_get_height(monitor->pixbuf)); cairo_scale (cr, hscale, vscale); gdk_cairo_set_source_pixbuf (cr, @@ -422,8 +422,8 @@ paint_monitor ( cairo_t *cr, y/vscale+((height/vscale)-gdk_pixbuf_get_height(monitor->pixbuf))/2); break; case MONITOR_STYLE_SCALED: -hscale = (width) / (gdk_pixbuf_get_width(monitor->pixbuf)); -vscale = (height) / (gdk_pixbuf_get_height(monitor->pixbuf)); +hscale = (width-20) / (gdk_pixbuf_get_width(monitor->pixbuf)); +vscale = (height-20) / (gdk_pixbuf_get_height(monitor->pixbuf)); if (hscale < vscale) { vscale = hscale; @@ -441,8 +441,8 @@ paint_monitor ( cairo_t *cr, break; case MONITOR_STYLE_ZOOMED: -hscale = (width) / (gdk_pixbuf_get_width(monitor->pixbuf)); -vscale = (height) / (gdk_pixbuf_get_height(monitor->pixbuf)); +hscale = (width-20) / (gdk_pixbuf_get_width(monitor->pixbuf)); +vscale = (height-20) / (gdk_pixbuf_get_height(monitor->pixbuf)); if (hscale > vscale) { vscale = hscale; @@ -461,8 +461,16 @@ paint_monitor ( cairo_t *cr, default: dst_pixbuf = gdk_pixbuf_copy (monitor->pixbuf); gdk_pixbuf_saturate_and_pixelate (monitor->pixbuf, dst_pixbuf, 0.0, TRUE); -hscale = width / (gdk_pixbuf_get_width(monitor->pixbuf)); -vscale = hscale; +hscale = (width-20) / (gdk_pixbuf_get_width(monitor->pixbuf)); +vscale = (height-20) / (gdk_pixbuf_get_height(monitor->pixbuf)); +if (hscale < vscale) +{ +vscale = hscale; +} +else +{ +hscale = vscale; +} cairo_scale (cr, hscale, vscale); gdk_cairo_set_source_pixbuf (cr, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update NEWS
Updating branch refs/heads/master to bf8aacf94a5e42c9a89efada1bb151a191719ea1 (commit) from 51052132ec4fe62e2f5b706dc3fb088f36d7b3c4 (commit) commit bf8aacf94a5e42c9a89efada1bb151a191719ea1 Author: Stephan Arts Date: Mon Nov 14 00:20:43 2011 +0100 Update NEWS NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index b6e4357..67b8b07 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ x.x.x - Add 'has-next' and 'has-previous' functions to disable the sensitivity of the 'back' and 'forward' buttons when showing the first or last image in a list. +- Improve preview of the set-wallpaper dialog. 0.3.0 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 58%
Updating branch refs/heads/master to 4f57bbd2c55743dba076c50611409f605918d45f (commit) from 452346453ba6169f677b93e0b27ee585767c1bcd (commit) commit 4f57bbd2c55743dba076c50611409f605918d45f Author: Ivica Kolić Date: Mon Nov 14 01:20:51 2011 +0100 l10n: Updated Croatian (hr) translation to 58% New status: 57 messages complete with 0 fuzzies and 41 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/hr.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/manual/po/hr.po b/doc/manual/po/hr.po index 4cc29ec..37d53ef 100644 --- a/doc/manual/po/hr.po +++ b/doc/manual/po/hr.po @@ -13,11 +13,11 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" +"X-Poedit-Country: CROATIA\n" "Language: \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Croatian\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Country: CROATIA\n" #. When image changes, this message will be marked fuzzy or untranslated for #. you. @@ -102,7 +102,7 @@ msgstr "be...@xfce.org" #: xfce4-session.xml56(releaseinfo) msgid "" "This manual describes the @PACKAGE_NAME@ package, version @PACKAGE_VERSION@." -msgstr "" +msgstr "Ovaj priručnik opisuje @ PACKAGE_NAME@ paketa, inačica PACKAGE_VERSION@ ." #: xfce4-session.xml65(title) msgid "Introduction" @@ -360,7 +360,7 @@ msgstr "" #: xfce4-session.xml267(term) msgid "${XDG_CONFIG_HOME}" -msgstr "" +msgstr "${XDG_CONFIG_HOME}" #: xfce4-session.xml269(para) msgid "" @@ -370,7 +370,7 @@ msgstr "" #: xfce4-session.xml276(term) msgid "${XDG_CONFIG_DIRS}" -msgstr "" +msgstr "${XDG_CONFIG_DIRS}" #: xfce4-session.xml278(para) msgid "" @@ -388,7 +388,7 @@ msgstr "" #: xfce4-session.xml289(term) msgid "${XDG_CACHE_HOME}" -msgstr "" +msgstr "${XDG_CACHE_HOME}" #: xfce4-session.xml291(para) msgid "" @@ -466,7 +466,7 @@ msgstr "${sysconfdir}/xdg/xfce4/kiosk/kioskrc" msgid "" "Kiosk mode configuration file. See next " "section for an explanation." -msgstr "" +msgstr "Konfiguracijska datoteka Kiosk načina rada. Vidjeti sljedeći odjeljak za objašnjenje." #: xfce4-session.xml351(para) msgid "" @@ -662,4 +662,4 @@ msgstr "" #. Put one translator per line, in the form of NAME , YEAR1, YEAR2 #: xfce4-session.xml0(None) msgid "translator-credits" -msgstr "" +msgstr "Ivica Kolić " ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Show error-dialog and do not open directory if file does not exist.
Updating branch refs/heads/master to d25c6d6aefe51ab13fdbf230bbd3d606b2a60b86 (commit) from bf8aacf94a5e42c9a89efada1bb151a191719ea1 (commit) commit d25c6d6aefe51ab13fdbf230bbd3d606b2a60b86 Author: Stephan Arts Date: Mon Nov 14 08:27:47 2011 +0100 Show error-dialog and do not open directory if file does not exist. 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 e95f37d..16e0dd2 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -2624,7 +2624,8 @@ cb_rstto_main_window_open_recent(GtkRecentChooser *chooser, RsttoMainWindow *win GFile *p_file; RsttoFile *rfile; -if (error == NULL) +if ((error == NULL) && +(g_file_query_exists (file, NULL))) { rfile = rstto_file_new (file); g_object_ref (rfile); @@ -2637,7 +2638,6 @@ cb_rstto_main_window_open_recent(GtkRecentChooser *chooser, RsttoMainWindow *win rstto_image_list_iter_find_file ( window->priv->iter, rfile ); - } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits