[Xfce4-commits] l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to 727660f56689b9430c39e03531d50ceca6048fcf (commit) from 329b32c260e0ee511adf5aecf3c7e95c692bdc7d (commit) commit 727660f56689b9430c39e03531d50ceca6048fcf Author: David Štancl Date: Mon Nov 15 09:28:07 2010 +0100 l10n: Updated Czech (cs) translation to 100% New status: 671 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 124 +- 1 files changed, 66 insertions(+), 58 deletions(-) diff --git a/po/cs.po b/po/cs.po index 03670f6..4d1da1d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-08 11:11+\n" +"POT-Creation-Date: 2010-11-15 05:11+\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -417,7 +417,7 @@ msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" #: ../midori/midori-browser.c:3893 ../midori/midori-view.c:2617 -#: ../midori/midori-view.c:4304 ../panels/midori-bookmarks.c:721 +#: ../midori/midori-view.c:4322 ../panels/midori-bookmarks.c:721 #: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" @@ -1030,7 +1030,7 @@ msgstr "Nastavení rozšíření '%s' nemůže být načteno: %s\n" #: ../midori/midori-extension.c:667 ../midori/midori-extension.c:764 #: ../midori/midori-extension.c:861 ../midori/midori-extension.c:973 -#: ../extensions/addons.c:1605 +#: ../extensions/addons.c:1613 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" @@ -1690,8 +1690,8 @@ msgstr "%s požaduje zjistit vaši polohu." #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1395 ../midori/midori-view.c:4732 -#: ../midori/midori-view.c:4736 +#: ../midori/midori-view.c:1395 ../midori/midori-view.c:4750 +#: ../midori/midori-view.c:4754 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1817,110 +1817,110 @@ msgstr "Typ souboru: %s ('%s')" msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3452 +#: ../midori/midori-view.c:3470 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3736 +#: ../midori/midori-view.c:3754 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3737 +#: ../midori/midori-view.c:3755 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3738 +#: ../midori/midori-view.c:3756 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3739 +#: ../midori/midori-view.c:3757 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3740 +#: ../midori/midori-view.c:3758 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3741 +#: ../midori/midori-view.c:3759 msgid "Set number of columns and rows" msgstr "Změnit počet sloupců a řádků" -#: ../midori/midori-view.c:3742 +#: ../midori/midori-view.c:3760 msgid "Enter number of columns and rows:" msgstr "Vložte počet sloupců a řádků:" -#: ../midori/midori-view.c:3743 +#: ../midori/midori-view.c:3761 msgid "Invalid input for the size of the speed dial" msgstr "Nesprávná hodnota velikosti rychlého přístupu" -#: ../midori/midori-view.c:3744 +#: ../midori/midori-view.c:3762 msgid "Thumb size:" msgstr "Velikost náhledů:" -#: ../midori/midori-view.c:3745 +#: ../midori/midori-view.c:3763 msgid "Small" msgstr "malá" -#: ../midori/midori-view.c:3746 +#: ../midori/midori-view.c:3764 msgid "Medium" msgstr "střední" -#: ../midori/midori-view.c:3747 +#: ../midori/midori-view.c:3765 msgid "Big" msgstr "velká" -#: ../midori/midori-view.c:3772 +#: ../midori/midori-view.c:3790 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3795 +#: ../midori/midori-view.c:3813 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3914 +#: ../midori/midori-view.c:3932 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3915 +#: ../midori/midori-view.c:3933 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3916 +#: ../midori/midori-view.c:3934 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:4057 +#: ../midori/m
[Xfce4-commits] l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to dfbb80332afec1f276f927e028dcacdaa939b89b (commit) from e261301ace8707163a13ae997d1ac0a35faf89cf (commit) commit dfbb80332afec1f276f927e028dcacdaa939b89b Author: Masato Hashimoto Date: Mon Nov 15 16:18:37 2010 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 51 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1418c19..343c020 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: fce4-time-out-plugin 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-12 00:07+0900\n" -"PO-Revision-Date: 2008-11-16 22:32+0900\n" -"Last-Translator: Nobuhiro Iwamatsu \n" +"POT-Creation-Date: 2010-11-16 00:15+0900\n" +"PO-Revision-Date: 2010-11-16 00:14+0900\n" +"Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "ひと休みする" #. Create menu item for resetting the timer #: ../panel-plugin/time-out.c:273 msgid "Reset timer" -msgstr "" +msgstr "タイマのリセット" #. Create menu item for enabling/disabling the countdown #: ../panel-plugin/time-out.c:281 @@ -34,17 +34,17 @@ msgstr "有効" #: ../panel-plugin/time-out.c:422 msgid "" "Xfce Panel plugin for taking a break from computer work every now and then." -msgstr "" +msgstr "コンピュータ作業中に時々ひと休みしてもらう Xfce パネルプラグインです。" #: ../panel-plugin/time-out.c:431 msgid "translator-credits" -msgstr "" +msgstr "Masato Hashimoto " #. Create properties dialog #: ../panel-plugin/time-out.c:463 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2 msgid "Time Out" -msgstr "タイムアウト" +msgstr "ひと休み" #. Create time settings section #: ../panel-plugin/time-out.c:480 @@ -63,7 +63,7 @@ msgstr "秒" #. Create break countdown time label #: ../panel-plugin/time-out.c:504 msgid "Time between breaks:" -msgstr "休憩間の時間:" +msgstr "休憩と休憩の間:" #. Create lock countdown time label #: ../panel-plugin/time-out.c:528 @@ -73,22 +73,22 @@ msgstr "休憩時間:" #. Create postpone countdown time label #: ../panel-plugin/time-out.c:546 msgid "Postpone length:" -msgstr "延期時間:" +msgstr "延長時間:" #. Create behaviour section #: ../panel-plugin/time-out.c:564 msgid "Behaviour" -msgstr "挙動" +msgstr "振る舞い" #. Create postpone check button #: ../panel-plugin/time-out.c:575 msgid "Allow postpone" -msgstr "許容遅延時間" +msgstr "休憩の先延ばしを許可する" #. Create resume check button #: ../panel-plugin/time-out.c:582 msgid "Resume automatically" -msgstr "" +msgstr "自動的に休憩を終わる" #. Create appearance section #: ../panel-plugin/time-out.c:589 @@ -113,16 +113,16 @@ msgstr "分を表示する" #. Create postpone button #: ../panel-plugin/time-out-lock-screen.c:219 msgid "_Postpone" -msgstr "時間を延ばす(_P)" +msgstr "作業を続けます(_P)" #. Create resume button #: ../panel-plugin/time-out-lock-screen.c:225 msgid "_Resume" -msgstr "" +msgstr "了解です(_R)" #: ../panel-plugin/time-out-countdown.c:377 msgid "The break is over." -msgstr "" +msgstr "休憩は終了です。" #. Hours:minutes:seconds #: ../panel-plugin/time-out-countdown.c:399 @@ -290,4 +290,4 @@ msgstr "残り時間: %d 時間 %d 分 %d 秒" #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1 msgid "Automatically controlled time outs and breaks" -msgstr "自動的に管理されたタイムアウトと休憩" +msgstr "休憩と休憩時間を管理します" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix confustion with panel opacity (bug #6827).
Updating branch refs/heads/master to 138751842ad6a9803fc0d40067548059c4acc6ad (commit) from 692c1304c347637df039ce8e4ad313b841a25623 (commit) commit 138751842ad6a9803fc0d40067548059c4acc6ad Author: Nick Schermer Date: Mon Nov 15 19:31:14 2010 +0100 Fix confustion with panel opacity (bug #6827). panel/panel-preferences-dialog.glade |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index a2b7925..1636f20 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -491,7 +491,7 @@ True True -Alpha value of the panel background, between 0 (transparent) and 100 (opaque). +Alpha value of the panel background, with 0 being fully transparent and 100 fully opaque. background-alpha 0 right @@ -637,7 +637,7 @@ True True -Transparency when the pointer is hovering over the panel. +Transparency when the pointer is hovering over the panel, with 0 being fully transparent and 100 fully opaque. enter-opacity 0 right @@ -651,7 +651,7 @@ True True -Transparency when the pointer is not hovering the panel. +Transparency when the pointer is not hovering over the panel, with 0 being fully transparent and 100 fully opaque. leave-opacity 0 right @@ -670,7 +670,7 @@ True -Transparency +Opacity ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Allow workspace names that start with a number (bug #6318).
Updating branch refs/heads/master to 379abcd6991650fdcba6d36ce813ac6177a4288f (commit) from 6dbd07e89bf85d096595a823ba7fb6171f71f493 (commit) commit 379abcd6991650fdcba6d36ce813ac6177a4288f Author: Nick Schermer Date: Mon Nov 15 19:43:07 2010 +0100 Allow workspace names that start with a number (bug #6318). src/windowlist.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windowlist.c b/src/windowlist.c index deaa341..0f8dbb5 100644 --- a/src/windowlist.c +++ b/src/windowlist.c @@ -258,7 +258,7 @@ windowlist_populate(XfceDesktop *desktop, ws_name = wnck_workspace_get_name(wnck_workspace); if(wnck_workspace == active_workspace) { -if(!ws_name || atoi(ws_name) == i+1) +if(ws_name == NULL || *ws_name == '\0') ws_label = g_strdup_printf(_("Workspace %d"), i+1); else { gchar *ws_name_esc = g_markup_escape_text(ws_name, strlen(ws_name)); @@ -266,7 +266,7 @@ windowlist_populate(XfceDesktop *desktop, g_free(ws_name_esc); } } else { /* don't italicise if we're showing stuff in submenus */ -if(!ws_name || atoi(ws_name) == i+1) { +if(ws_name == NULL || *ws_name == '\0') { if(wl_submenus) ws_label = g_strdup_printf(_("Workspace %d"), i+1); else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make miniature view the default in the pager (bug #6825).
Updating branch refs/heads/master to c67e4782ef4feb213760a6fa80adc17d0eaed94f (commit) from 138751842ad6a9803fc0d40067548059c4acc6ad (commit) commit c67e4782ef4feb213760a6fa80adc17d0eaed94f Author: Nick Schermer Date: Mon Nov 15 19:44:36 2010 +0100 Make miniature view the default in the pager (bug #6825). The other pages consumes too much space with the default workspace names. plugins/pager/pager.c |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c index 1dbee72..3e92feb 100644 --- a/plugins/pager/pager.c +++ b/plugins/pager/pager.c @@ -132,7 +132,7 @@ pager_plugin_class_init (PagerPluginClass *klass) PROP_MINIATURE_VIEW, g_param_spec_boolean ("miniature-view", NULL, NULL, - FALSE, + TRUE, EXO_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -141,8 +141,6 @@ pager_plugin_class_init (PagerPluginClass *klass) NULL, NULL, 1, 50, 1, EXO_PARAM_READWRITE)); - - } @@ -152,7 +150,7 @@ pager_plugin_init (PagerPlugin *plugin) { plugin->wnck_screen = NULL; plugin->scrolling = TRUE; - plugin->miniature_view = FALSE; + plugin->miniature_view = TRUE; plugin->rows = 1; plugin->pager = NULL; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Refactor message reading into a Message struct
Updating branch refs/heads/master to 46c78e550e41d3f6242576049bd512f3a85133cb (commit) from 30aeb97f933e783919ce9a7161d8e650f21265af (commit) commit 46c78e550e41d3f6242576049bd512f3a85133cb Author: Christian Dywan Date: Mon Nov 15 20:12:45 2010 +0100 Refactor message reading into a Message struct The read_message() method checks if the message shouldn't be visible and returns null in that case, otherwise it fills a struct with meta data. postler/postler-messages.vala | 249 +++-- 1 files changed, 139 insertions(+), 110 deletions(-) diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala index a1a04ea..61abe33 100644 --- a/postler/postler-messages.vala +++ b/postler/postler-messages.vala @@ -21,6 +21,7 @@ public class Postler.Messages : Gtk.TreeView { public string? selected_location { get; set; } public bool newest_at_the_bottom { get; set; default = false; } +string to_or_from; string last_location; string last_filter = ""; @@ -466,6 +467,127 @@ public class Postler.Messages : Gtk.TreeView { populate (last_location, filter.down (), header); } +private struct Message { +string location; +string subject; +public string get_subject () { +return subject != null ? subject : _("No subject"); +} +string status; +int font_weight; +bool flagged; +string from; +public string get_from () { +return from != null ? from : _("Unknown"); +} +time_t timestamp; +int64 size; +string attachment; +} + +private Message? read_message (File contents, bool folder_new, +string[] headers, string[] filters) { + +string filename = contents.get_basename (); +if (filename[0] == '.') +return null; + +string status = STOCK_MAIL_UNREAD; +int font_weight = Pango.Weight.BOLD; +string flags = null; +if (!folder_new) { +status = parse_flags (filename, out flags, out font_weight); +if (hide_read && font_weight != Pango.Weight.BOLD && flags == null) +return null; +if (flags != null && flags[0] == 'T') +return null; +} + +var message = new Message (); +message.status = status; +message.font_weight = font_weight; +message.flagged = flags != null; +message.location = contents.get_path (); +message.subject = null; +message.from = null; +message.timestamp = 0; + +string content_type = show_attachments ? null : ""; +try { +var stream = new DataInputStream (contents.read (null)); +string line; +while ((line = stream.read_line (null, null)) != null) { +if (line == "") +break; +string[] parts = line.split (":", 2); +if (parts == null || parts[0] == null) +continue; +string field = ascii_strdown (parts[0]); +if (filters[0] != null && parts[1] != null) { +string lowercased = ascii_strdown (parts[1]); +if (headers[0] == field + && !(filters[0] in lowercased)) +return null; +else if (filters[1] != null && headers[1] == field + && !(filters[1] in lowercased)) +return null; +} +if (field == "subject") { +message.subject = parts[1].strip (); +if (message.from != null && message.timestamp != 0 + && content_type != null && filters[0] == null) +break; +} +else if (field == to_or_from) { +message.from = parts[1]; +if (message.subject != null && message.timestamp != 0 + && content_type != null && filters[0] == null) +break; +} +else if (field == "date") { +var parsed = new Soup.Date.from_string (parts[1]); +message.timestamp = parsed != null ? (time_t)parsed.to_time_t () : 0; +if (message.subject != null && message.from != null + && content_type != null && filters[0] == null) +break; +} +else if (field == "content-type") { +content_type = parts[1].strip (); +if (message.subject != null && message.from != null + && message.timestamp != 0 && filters[0] == null) +break; +} +} + +unowned string? fulltext = null; +if (headers[0] == "full
[Xfce4-commits] Move selected folder monitoring into Messages
Updating branch refs/heads/master to e123c8289a77b480a4fccf325ae80e87e458c526 (commit) from 46c78e550e41d3f6242576049bd512f3a85133cb (commit) commit e123c8289a77b480a4fccf325ae80e87e458c526 Author: Christian Dywan Date: Mon Nov 15 20:15:55 2010 +0100 Move selected folder monitoring into Messages Instead of completely reloading the folder, only the new file is inserted or removed accordingly. postler/postler-folders.vala | 25 --- postler/postler-messages.vala | 53 + 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala index 86f3d38..2386d75 100644 --- a/postler/postler-folders.vala +++ b/postler/postler-folders.vala @@ -19,7 +19,6 @@ public class Postler.Folders : Gtk.TreeView { Accounts accounts; Gtk.TreeStore store; string last_location; -FileMonitor[] folder_monitors = {}; public Postler.Messages messages { get; set; } public string? selected_location { @@ -75,11 +74,6 @@ public class Postler.Folders : Gtk.TreeView { { "Trash", STOCK_USER_TRASH, N_("Trash") }, { "Archive", STOCK_ARCHIVE, N_("Archive") } }; - -void folder_monitor_changed (string location) { -messages.populate (location); -messages.grab_focus (); -} void unread_monitor_changed (File msg_dir, string path, string account) { try { @@ -265,32 +259,13 @@ public class Postler.Folders : Gtk.TreeView { notify_property ("selected-location"); if (location != null) { -folder_monitors = {}; messages.populate (location); messages.grab_focus (); - -var location_dir = File.new_for_path (location); -var new_message_dir = location_dir.resolve_relative_path ( -location + "/new"); -var message_dir = location_dir.resolve_relative_path ( -location + "/cur"); -FileMonitor new_monitor = monitor_folder (new_message_dir, location); -FileMonitor monitor = monitor_folder (message_dir, location); -folder_monitors += new_monitor; -folder_monitors += monitor; } else messages.clear (); } -FileMonitor monitor_folder (File message_dir, string location) { -FileMonitor folder_monitor = message_dir.monitor_directory (0, null); -folder_monitor.changed.connect ((folder_monitor, file, other, event) => { -folder_monitor_changed (location); -}); -return folder_monitor; -} - void import_folder (Gtk.TreeIter iter) { var dialog = new Gtk.FileChooserDialog (_("Import Archived Mailbox"), get_toplevel () as Gtk.Window, Gtk.FileChooserAction.OPEN); diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala index 61abe33..d893b47 100644 --- a/postler/postler-messages.vala +++ b/postler/postler-messages.vala @@ -24,6 +24,7 @@ public class Postler.Messages : Gtk.TreeView { string to_or_from; string last_location; string last_filter = ""; +FileMonitor[] folder_monitors = {}; enum Columns { FLAGGED, @@ -396,6 +397,7 @@ public class Postler.Messages : Gtk.TreeView { } public void clear () { +folder_monitors = {}; store.clear (); } @@ -637,6 +639,10 @@ public class Postler.Messages : Gtk.TreeView { FILE_ATTRIBUTE_STANDARD_SIZE, 0, null); GLib.FileInfo info; +FileMonitor folder_monitor = folder_dir.monitor_directory (0, null); +folder_monitor.changed.connect (folder_monitor_changed); +folder_monitors += folder_monitor; + folder = folder_dir.get_basename (); bool folder_new = folder_dir.get_path ().has_suffix ("new"); while ((info = folder_enumerator.next_file (null)) != null) { @@ -678,6 +684,7 @@ public class Postler.Messages : Gtk.TreeView { vadjustment.value = 0; } catch (GLib.Error error) { +folder_monitors = {}; sort = new Gtk.TreeModelSort.with_model (store); model = sort; GLib.critical (_("Failed to read folder \"%s\": %s"), @@ -732,6 +739,52 @@ public class Postler.Messages : Gtk.TreeView { } } +bool get_message_iter (string location, out Gtk.TreeIter iter) { +Gtk.TreeIter message_iter; +if (!store.iter_children (out message_iter, null)) +return false; +do { +string existing_location; +store.get (message_iter, Columns.LOCATION, out existing_location); +if (existing_location == location) { +if (&iter != null) +iter = message_iter; +return true; +} +} while (store.iter_nex
[Xfce4-commits] Update NEWS
Updating branch refs/heads/master to df67a021054d837197731450283d79995eab8546 (commit) from 565519daa73bc7a737739b3ea618d076b159c7be (commit) commit df67a021054d837197731450283d79995eab8546 Author: Stephan Arts Date: Mon Nov 15 20:13:18 2010 +0100 Update NEWS NEWS | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 7e08ce2..2d5d898 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +0.0.92 +== +- Remove dependency on libxfcegui4 +- Restore size of thumbnail-bar +- Save and restore image zoom-state when navigating +- Implement 'Ready' signal-handler for thumbnailer-spec +- Fix build with --no-add-needed +- Set 'preload-images' checkbox to the right state when the + preferences-window is created +- Correctly cleanup the references to xfconf + 0.0.91 == - Remove dependency on thunar ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove debug output
Updating branch refs/heads/master to 565519daa73bc7a737739b3ea618d076b159c7be (commit) from 83c6c8c5be9cdb58c35e2d1a8b3046ae2bbcef8d (commit) commit 565519daa73bc7a737739b3ea618d076b159c7be Author: Stephan Arts Date: Mon Nov 15 20:07:29 2010 +0100 Remove debug output TODO |4 ++-- src/image.c |2 +- src/main_window.c |1 - src/thumbnailer.c |1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 14e25ff..ba678b5 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ - Implement preferences dialog - Generate and save thumbnails (DONE) -- Listen to Ready signal +- Listen to Ready signal (DONE) - Support setting wallpapers - nautilus @@ -12,7 +12,7 @@ - Write comments - Improve thumbnailbar -- Save thumbnailbar size +- Save thumbnailbar size (DONE) - Support image collections - Export to tarball/zip diff --git a/src/image.c b/src/image.c index 2e45a98..9b3c2ce 100644 --- a/src/image.c +++ b/src/image.c @@ -314,7 +314,7 @@ rstto_image_new (GFile *file) gboolean rstto_image_load (RsttoImage *image, gboolean empty_cache, gdouble scale, gboolean preload, GError **error) { -g_debug("%s: %f", __FUNCTION__, scale); +/* g_debug("%s: %f", __FUNCTION__, scale); */ RsttoImageCache *cache; g_return_val_if_fail (image != NULL, FALSE); diff --git a/src/main_window.c b/src/main_window.c index 029ca7c..c84d3d8 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -702,7 +702,6 @@ rstto_main_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation) /* if the panel-position is unset, set it */ if (gtk_paned_get_position (GTK_PANED(window->priv->vpaned_top)) == 0) { -g_debug ("set size"); gtk_paned_set_position (GTK_PANED(window->priv->vpaned_top), rstto_settings_get_uint_property(window->priv->settings_manager, "thumbnailbar-size")); gtk_paned_set_position (GTK_PANED(window->priv->vpaned_bottom), window->priv->vpaned_bottom->allocation.height - rstto_settings_get_uint_property(window->priv->settings_manager, "thumbnailbar-size")); diff --git a/src/thumbnailer.c b/src/thumbnailer.c index 721e98f..ad6452b 100644 --- a/src/thumbnailer.c +++ b/src/thumbnailer.c @@ -341,7 +341,6 @@ cb_rstto_thumbnailer_request_finished (DBusGProxy *proxy, gint handle, gpointer static void cb_rstto_thumbnailer_thumbnail_ready (DBusGProxy *proxy, gint handle, const gchar **uri, gpointer data) { -/* g_debug("Ready"); */ RsttoThumbnailer *thumbnailer = RSTTO_THUMBNAILER (data); RsttoThumbnail *thumbnail; RsttoImage *image; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve performance when opening a lot of files (Bug #6677) - Reduce I/O. - Apply patch by Ala Luszczak
Updating branch refs/heads/master to f94dfd551f71a792686b580cdfb357a5581dfc65 (commit) from f529ab4578e71917841cc2e1d095e3243bc06808 (commit) commit f94dfd551f71a792686b580cdfb357a5581dfc65 Author: Stephan Arts Date: Mon Nov 15 20:23:27 2010 +0100 Improve performance when opening a lot of files (Bug #6677) - Reduce I/O. - Apply patch by Ala Luszczak src/image.c | 48 --- src/image.h |1 + src/main_window.c| 68 ++--- src/main_window.h|2 + src/picture_viewer.c |3 ++ 5 files changed, 80 insertions(+), 42 deletions(-) diff --git a/src/image.c b/src/image.c index 9b3c2ce..f4f5019 100644 --- a/src/image.c +++ b/src/image.c @@ -261,33 +261,14 @@ RsttoImage * rstto_image_new (GFile *file) { RsttoImage *image = g_object_new (RSTTO_TYPE_IMAGE, NULL); -gchar *file_path = g_file_get_path (file); -ExifEntry *exif_entry = NULL; g_object_ref (file); image->priv->file = file; -image->priv->exif_data = exif_data_new_from_file (file_path); +image->priv->exif_data = NULL; image->priv->thumbnail = NULL; image->priv->pixbuf = NULL; - -if (image->priv->exif_data) { -exif_entry = exif_data_get_entry (image->priv->exif_data, EXIF_TAG_ORIENTATION); -} -/* Check if the image has exif-data available */ -if (exif_entry && exif_entry->data != NULL) -{ -/* Get the image-orientation from EXIF data */ -image->priv->orientation = exif_get_short (exif_entry->data, exif_data_get_byte_order (exif_entry->parent->parent)); -if (image->priv->orientation == 0) -/* Default orientation */ -image->priv->orientation = RSTTO_IMAGE_ORIENT_NONE; -} -else -{ -/* Default orientation */ -image->priv->orientation = RSTTO_IMAGE_ORIENT_NONE; -} +image->priv->orientation = RSTTO_IMAGE_ORIENT_NOT_DETERMINED; return image; } @@ -554,6 +535,31 @@ rstto_image_get_size (RsttoImage *image) RsttoImageOrientation rstto_image_get_orientation (RsttoImage *image) { + if (image->priv->orientation == RSTTO_IMAGE_ORIENT_NOT_DETERMINED){ + gchar *file_path = g_file_get_path (image->priv->file); + ExifEntry *exif_entry = NULL; + + image->priv->exif_data = exif_data_new_from_file (file_path); + + if (image->priv->exif_data) { + exif_entry = exif_data_get_entry (image->priv->exif_data, EXIF_TAG_ORIENTATION); + } + /* Check if the image has exif-data available */ + if (exif_entry && exif_entry->data != NULL) + { + /* Get the image-orientation from EXIF data */ + image->priv->orientation = exif_get_short (exif_entry->data, exif_data_get_byte_order (exif_entry->parent->parent)); + if (image->priv->orientation == 0) + /* Default orientation */ + image->priv->orientation = RSTTO_IMAGE_ORIENT_NONE; + } + else + { + /* Default orientation */ + image->priv->orientation = RSTTO_IMAGE_ORIENT_NONE; + } + } + return image->priv->orientation; } diff --git a/src/image.h b/src/image.h index a36659b..c6a8407 100644 --- a/src/image.h +++ b/src/image.h @@ -31,6 +31,7 @@ typedef enum RSTTO_IMAGE_ORIENT_90, RSTTO_IMAGE_ORIENT_TRANSVERSE, RSTTO_IMAGE_ORIENT_270, + RSTTO_IMAGE_ORIENT_NOT_DETERMINED, } RsttoImageOrientation; #define RSTTO_TYPE_IMAGE rstto_image_get_type() diff --git a/src/main_window.c b/src/main_window.c index c4f9bb6..8aa40ac 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -55,6 +55,9 @@ #define ZOOM_FACTOR 1.2 #endif +#define RSTTO_RECENT_FILES_APP_NAME "ristretto" +#define RSTTO_RECENT_FILES_GROUP "Graphics" + struct _RsttoMainWindowPriv { struct { @@ -262,6 +265,10 @@ cb_rstto_main_window_vpaned_pos_changed (GtkWidget *widget, gpointer user_data); static void cb_rstto_main_window_hpaned_pos_changed (GtkWidget *widget, gpointer user_data); +gboolean +rstto_main_window_add_file_to_recent_files (GFile *file); + + static GtkWidgetClass *parent_class = NULL; static GtkActionEntry action_entries[] = @@ -2016,13 +2023,7 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window) gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } -else -{ -uri = g_file_get_uri (_files_iter->data); -gtk_recent_manager_add_item (window->priv->recent_manager, uri); -g_free (uri); -uri = NULL; -} + _files_iter = g_slist_next (_files_iter); } } @@ -2039,15 +2040,6 @@ cb_rstto_main_window_open_image (GtkWidget *widget,
[Xfce4-commits] Mark missing strings as translatable (Bug #6303)
Updating branch refs/heads/master to f529ab4578e71917841cc2e1d095e3243bc06808 (commit) from df67a021054d837197731450283d79995eab8546 (commit) commit f529ab4578e71917841cc2e1d095e3243bc06808 Author: Stephan Arts Date: Mon Nov 15 20:16:36 2010 +0100 Mark missing strings as translatable (Bug #6303) 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 c84d3d8..c4f9bb6 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -441,8 +441,8 @@ rstto_main_window_init (RsttoMainWindow *window) /* Create Play/Pause Slideshow actions */ -window->priv->play_action = gtk_action_new ("play", "_Play", "Play slideshow", GTK_STOCK_MEDIA_PLAY); -window->priv->pause_action = gtk_action_new ("pause", "_Pause", "Pause slideshow", GTK_STOCK_MEDIA_PAUSE); +window->priv->play_action = gtk_action_new ("play", N_("_Play"), N_("Play slideshow"), GTK_STOCK_MEDIA_PLAY); +window->priv->pause_action = gtk_action_new ("pause", N_("_Pause"), N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE); /* Create Recently used items Action */ window->priv->recent_action = gtk_recent_action_new_for_manager ("document-open-recent", N_("_Recently used"), N_("Recently used"), 0, GTK_RECENT_MANAGER(window->priv->recent_manager)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve version-number for development versions
Updating branch refs/heads/master to a3a4734ff93c628f82c1cb27acc509d0e283a448 (commit) from cac357a7cf4b4fe7891aaf4bf67a8500c5b74740 (commit) commit a3a4734ff93c628f82c1cb27acc509d0e283a448 Author: Stephan Arts Date: Mon Nov 15 20:31:35 2010 +0100 Improve version-number for development versions configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index ceb59a4..1fea5c4 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,7 +14,7 @@ m4_define([ristretto_version_minor], [0]) m4_define([ristretto_version_micro], [91]) m4_define([ristretto_version_build], [...@revision@]) m4_define([ristretto_version_tag], [dev]) # Leave empty for releases -m4_define([ristretto_version], [ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(),[],[], [-ifelse(ristretto_version_tag(), [svn], [ristretto_version_tag()-ristretto_version_build()], [ristretto_version_tag()])])]) +m4_define([ristretto_version], [ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(),[],[], [-ifelse(ristretto_version_tag(), [git], [ristretto_version_tag()-ristretto_version_build()], [ristretto_version_tag()])])]) dnl *** dnl *** Debugging support for SVN snapshots *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove GFileMonitor from image class, going to be replaced by a singleton for file-monitoring
Updating branch refs/heads/master to 20aaa4b36f08e9b4d274955f9bb4e5c5d5ff064c (commit) from a3a4734ff93c628f82c1cb27acc509d0e283a448 (commit) commit 20aaa4b36f08e9b4d274955f9bb4e5c5d5ff064c Author: Stephan Arts Date: Mon Nov 15 20:36:20 2010 +0100 remove GFileMonitor from image class, going to be replaced by a singleton for file-monitoring src/image.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/image.c b/src/image.c index f4f5019..09fe562 100644 --- a/src/image.c +++ b/src/image.c @@ -100,7 +100,6 @@ struct _RsttoImagePriv /* File data */ /*/ GFile *file; -GFileMonitor *monitor; GCancellable *cancellable; /* File I/O data */ @@ -136,7 +135,6 @@ rstto_image_init (GObject *object) /* Initialize buffer for image-loading */ image->priv->buffer = g_new0 (guchar, RSTTO_IMAGE_BUFFER_SIZE); image->priv->cancellable = g_cancellable_new(); - } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make sure the thumbnailer owns a reference to the thumbnails when they are in the queue, so ristretto won't crash when the thumbnailer returns after the image has be
Updating branch refs/heads/master to 08ddd963b8982aaf2bbb4e0a9619beb24c704cf5 (commit) from 20aaa4b36f08e9b4d274955f9bb4e5c5d5ff064c (commit) commit 08ddd963b8982aaf2bbb4e0a9619beb24c704cf5 Author: Stephan Arts Date: Mon Nov 15 21:21:19 2010 +0100 Make sure the thumbnailer owns a reference to the thumbnails when they are in the queue, so ristretto won't crash when the thumbnailer returns after the image has been removed. src/thumbnailer.c | 25 + 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/thumbnailer.c b/src/thumbnailer.c index ad6452b..105ae70 100644 --- a/src/thumbnailer.c +++ b/src/thumbnailer.c @@ -250,6 +250,7 @@ rstto_thumbnailer_queue_image (RsttoThumbnailer *thumbnailer, RsttoImage *image) if (g_slist_find (thumbnailer->priv->queue, image) == NULL) { +g_object_ref (image); thumbnailer->priv->queue = g_slist_prepend (thumbnailer->priv->queue, image); } @@ -274,7 +275,11 @@ rstto_thumbnailer_dequeue_image (RsttoThumbnailer *thumbnailer, RsttoImage *imag } } -thumbnailer->priv->queue = g_slist_remove_all (thumbnailer->priv->queue, image); +if (g_slist_find (thumbnailer->priv->queue, image) != NULL) +{ +thumbnailer->priv->queue = g_slist_remove_all (thumbnailer->priv->queue, image); +g_object_unref (image); +} thumbnailer->priv->request_timer_id = g_timeout_add_full (G_PRIORITY_LOW, 300, (GSourceFunc)rstto_thumbnailer_queue_request_timer, thumbnailer, NULL); /* g_debug("%s, len: %d", __FUNCTION__, g_slist_length(thumbnailer->priv->queue)); */ @@ -298,13 +303,16 @@ rstto_thumbnailer_queue_request_timer (RsttoThumbnailer *thumbnailer) iter = thumbnailer->priv->queue; while (iter) { -image = rstto_thumbnail_get_image (RSTTO_THUMBNAIL(iter->data)); -file = rstto_image_get_file (image); -uris[i] = g_file_get_uri (file); -file_info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL); -if (file_info) +if (iter->data) { -mimetypes[i] = g_file_info_get_attribute_string (file_info, "standard::content-type"); +image = rstto_thumbnail_get_image (RSTTO_THUMBNAIL(iter->data)); +file = rstto_image_get_file (image); +uris[i] = g_file_get_uri (file); +file_info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL); +if (file_info) +{ +mimetypes[i] = g_file_info_get_attribute_string (file_info, "standard::content-type"); +} } iter = g_slist_next(iter); i++; @@ -351,7 +359,7 @@ cb_rstto_thumbnailer_thumbnail_ready (DBusGProxy *proxy, gint handle, const gcha gchar *f_uri; while (iter) { -if (uri[x] == NULL) +if ((uri[x] == NULL) || (iter->data == NULL)) { break; } @@ -364,6 +372,7 @@ cb_rstto_thumbnailer_thumbnail_ready (DBusGProxy *proxy, gint handle, const gcha { rstto_thumbnail_update (thumbnail); thumbnailer->priv->queue = g_slist_remove (thumbnailer->priv->queue, iter->data); +g_object_unref (thumbnail); iter = thumbnailer->priv->queue; x++; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Restore splash screen functionality (bug #6831).
Updating branch refs/heads/master to 66de3a9161e768439118019e0b40e2aace207b10 (commit) from 394a43c96387ec1c294105b6fa8ea610d5e381dc (commit) commit 66de3a9161e768439118019e0b40e2aace207b10 Author: Romain Bouvier Date: Mon Nov 15 23:07:18 2010 +0100 Restore splash screen functionality (bug #6831). xfce4-session/xfsm-splash-screen.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xfce4-session/xfsm-splash-screen.c b/xfce4-session/xfsm-splash-screen.c index d22a098..22bf667 100644 --- a/xfce4-session/xfsm-splash-screen.c +++ b/xfce4-session/xfsm-splash-screen.c @@ -280,7 +280,7 @@ xfsm_splash_screen_load (XfsmSplashScreen *splash, void (*init) (XfsmSplashEngine *engine); gchar *filename; - filename = g_module_build_path (LIBDIR "/xfce4/splash/engines", engine); + filename = g_module_build_path (LIBDIR "/xfce4/session/splash-engines", engine); splash->module = g_module_open (filename, G_MODULE_BIND_LOCAL); g_free (filename); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 8a30b9f4133e51bcf69a8b379064c0ca57a6 (commit) from 08ddd963b8982aaf2bbb4e0a9619beb24c704cf5 (commit) commit 8a30b9f4133e51bcf69a8b379064c0ca57a6 Author: Per Kongstad Date: Tue Nov 16 00:20:45 2010 +0100 l10n: Updated Danish (da) translation to 100% New status: 124 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 26 +- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/po/da.po b/po/da.po index 1d3d0e8..7f0cd44 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 Stephan Arts # This file is distributed under the same license as the Ristretto package. # Per Kongstad , 2008, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: ristretto 0.0.90\n" @@ -37,8 +37,7 @@ msgid "" "Try %s --help to see a full list of available command line options.\n" msgstr "" "%s: %s\n" -"Prøv %s --help for at se en fuld liste over tilgængelige " -"kommandolinjetilvalg.\n" +"Prøv %s --help for at se en fuld liste over tilgængelige kommandolinjetilvalg.\n" #. File Menu #: ../src/main_window.c:277 @@ -269,21 +268,19 @@ msgstr "Bund" #. Create Play/Pause Slideshow actions #: ../src/main_window.c:451 msgid "_Play" -msgstr "" +msgstr "_Afspil" #: ../src/main_window.c:451 -#, fuzzy msgid "Play slideshow" -msgstr "Start et diasshow" +msgstr "Afspil et diasshow" #: ../src/main_window.c:452 msgid "_Pause" -msgstr "" +msgstr "_Pause" #: ../src/main_window.c:452 -#, fuzzy msgid "Pause slideshow" -msgstr "Start et diasshow" +msgstr "Pause diasshow" #. Create Recently used items Action #: ../src/main_window.c:455 @@ -597,19 +594,14 @@ msgstr "Ristretto billedfremviser" #~ msgid "H_ide" #~ msgstr "S_kjul" -#~ msgid "" -#~ "One or more images have been modified, do you want to save the changes?" -#~ msgstr "" -#~ "Et eller flere billeder er blevet ændret, ønsker du at gemme disse " -#~ "ændringer?" +#~ msgid "One or more images have been modified, do you want to save the changes?" +#~ msgstr "Et eller flere billeder er blevet ændret, ønsker du at gemme disse ændringer?" #~ msgid "Image viewer Preferences" #~ msgstr "Indstillinger for billedfremviser" #~ msgid "_Preload images (GUI more responsive but more CPU-intensive)" -#~ msgstr "" -#~ "_Forindlæs billeder (Grafisk miljø reagerer hurtigere men vil bruge flere " -#~ "processorresurser)" +#~ msgstr "_Forindlæs billeder (Grafisk miljø reagerer hurtigere men vil bruge flere processorresurser)" #~ msgid "Hide the thumbnails bar during slideshow" #~ msgstr "Skjul miniaturebjælke under diasshow" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 99%
Updating branch refs/heads/master to ef90f27d1dd7b92bca4d4151458ee5d5080106cf (commit) from c67e4782ef4feb213760a6fa80adc17d0eaed94f (commit) commit ef90f27d1dd7b92bca4d4151458ee5d5080106cf Author: Per Kongstad Date: Tue Nov 16 00:23:35 2010 +0100 l10n: Updated Danish (da) translation to 99% New status: 342 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 85 + 1 files changed, 46 insertions(+), 39 deletions(-) diff --git a/po/da.po b/po/da.po index 2aa44cd..e8d220e 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-05 17:08+\n" +"POT-Creation-Date: 2010-11-15 23:07+\n" "PO-Revision-Date: 2010-06-14 11:44+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -220,11 +220,11 @@ msgstr "Ugyldigt udvidelsesmodul syntaks angivet. Brug UDVIDELSESMODULNAVN:NAVN[ msgid "Invalid hint type \"%s\". Valid types are bool, double, int, string and uint." msgstr "Ugyldig hentydningstype \"%s\". Valide typer er boolesk, heltal , strenge og heltal uden fortegn." -#: ../panel/panel-dialogs.c:79 +#: ../panel/panel-dialogs.c:76 msgid "The panel of the Xfce Desktop Environment" msgstr "Panelet til skrivebordsmiljøet Xfce" -#: ../panel/panel-dialogs.c:84 +#: ../panel/panel-dialogs.c:81 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -233,25 +233,25 @@ msgstr "" "Mere info: http://www.dansk-gruppen.dk"; #. setup the dialog -#: ../panel/panel-dialogs.c:125 ../plugins/launcher/launcher-dialog.glade.h:1 +#: ../panel/panel-dialogs.c:122 ../plugins/launcher/launcher-dialog.glade.h:1 msgid "Add New Item" msgstr "Tilføj nyt element" -#: ../panel/panel-dialogs.c:139 +#: ../panel/panel-dialogs.c:136 msgid "Please choose a panel for the new plugin:" msgstr "Vælg venligst et panel for det nye udvidelsesmodul:" #. I18N: panel combo box in the preferences dialog -#: ../panel/panel-dialogs.c:150 ../panel/panel-preferences-dialog.c:754 +#: ../panel/panel-dialogs.c:147 ../panel/panel-preferences-dialog.c:754 #, c-format msgid "Panel %d" msgstr "Panel %d" -#: ../panel/panel-dialogs.c:186 +#: ../panel/panel-dialogs.c:183 msgid "Because the panel is running in kiosk mode, you are not allowed to make changes to the panel configuration as a regular user" msgstr "Fordi panelet kører i kiosktilstand, er du ikke tilladt at lave ændringer til panelindstillingen som en normal bruger" -#: ../panel/panel-dialogs.c:188 +#: ../panel/panel-dialogs.c:185 msgid "Modifying the panel is not allowed" msgstr "Tilpasning af panelet er ikke tilladt" @@ -345,7 +345,8 @@ msgid "Add new item to this panel" msgstr "Tilføj nye elementer til dette panel" #: ../panel/panel-preferences-dialog.glade.h:4 -msgid "Alpha value of the panel background, between 0 (transparent) and 100 (opaque)." +#, fuzzy +msgid "Alpha value of the panel background, with 0 being fully transparent and 100 fully opaque." msgstr "Alfaværdi af panelbaggrunden mellem 0 (gennemsigtig) eller 100 (ugennemsigtig)." #: ../panel/panel-preferences-dialog.glade.h:5 @@ -420,60 +421,60 @@ msgid "O_utput:" msgstr "Ud_data:" #: ../panel/panel-preferences-dialog.glade.h:23 +msgid "Opacity" +msgstr "Ugennemsigtig" + +#: ../panel/panel-preferences-dialog.glade.h:24 msgid "Pick a Panel Color" msgstr "Vælg en panelfarve" -#: ../panel/panel-preferences-dialog.glade.h:24 +#: ../panel/panel-preferences-dialog.glade.h:25 msgid "Remove currently selected item" msgstr "Fjern det aktuelle valgte element" -#: ../panel/panel-preferences-dialog.glade.h:25 +#: ../panel/panel-preferences-dialog.glade.h:26 msgid "Remove the currently selected panel" msgstr "Fjern det aktuelle valgte panel" -#: ../panel/panel-preferences-dialog.glade.h:26 +#: ../panel/panel-preferences-dialog.glade.h:27 msgid "Select A Background Image" msgstr "Vælg et baggrundsbillede" -#: ../panel/panel-preferences-dialog.glade.h:27 +#: ../panel/panel-preferences-dialog.glade.h:28 msgid "Select this option to automatically increase the length of the panel if the plugins request more space." msgstr "Vælg denne indstilling for automatisk udvidelse af panelets længde hvis udvidelsesmodulerne behøver mere plads." -#: ../panel/panel-preferences-dialog.glade.h:28 +#: ../panel/panel-preferences-dialog.glade.h:29 msgid "Select this option to extend the panel over multiple monitors." msgstr "Vælg denne indstilling for af brede panelet ud over flere skærme." -#: ../panel/panel-preferences-dialog.glade.h:29 +#: ../panel/panel-preferences-dialog.glade.h:30 msgid "Select this option to hide the handles of the panel and lock its position." msgstr "Vælg denne indstilling for at skjule håndtagene til panelet og fastlåse positionen." -#: ../panel/panel-preferences-
[Xfce4-commits] l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 57d7d68c6e28ea93ebfd2c0403ec5d4d070608f9 (commit) from f5d46e944af70a9295936e92713120c1717a822d (commit) commit 57d7d68c6e28ea93ebfd2c0403ec5d4d070608f9 Author: Per Kongstad Date: Tue Nov 16 00:26:54 2010 +0100 l10n: Updated Danish (da) translation to 100% New status: 54 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 107 - 1 files changed, 63 insertions(+), 44 deletions(-) diff --git a/po/da.po b/po/da.po index e858fb8..7a889d9 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-notes-plugin 1.7.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-08 11:03+\n" +"POT-Creation-Date: 2010-11-15 23:03+\n" "PO-Revision-Date: 2009-12-02 10:55+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,55 +21,70 @@ msgstr "" #: ../src/xfce4-notes.desktop.in.h:1 #: ../src/xfce4-notes-autostart.desktop.in.h:1 #: ../src/xfce4-notes-plugin.desktop.in.in.h:1 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:565 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:611 msgid "Ideal for your quick notes" msgstr "Ideel til dine hurtignoter" #: ../src/xfce4-notes.desktop.in.h:2 #: ../src/xfce4-notes-autostart.desktop.in.h:2 #: ../src/xfce4-notes-plugin.desktop.in.in.h:2 -#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:137 -#: ../lib/application.vala:164 ../lib/application.vala:563 +#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:183 +#: ../lib/application.vala:210 ../lib/application.vala:609 #: ../lib/window.vala:84 ../lib/window.vala:159 ../lib/window.vala:884 -#: ../src/xfce4-notes-settings.c:95 ../src/main-panel-plugin-47.vala:46 +#: ../src/xfce4-notes-settings.c:99 ../src/main-panel-plugin-47.vala:46 #: ../src/main-panel-plugin.vala:45 ../src/main-status-icon.vala:34 #: ../src/main-status-icon.vala:115 msgid "Notes" msgstr "Noter" -#: ../lib/application.vala:141 ../lib/window.vala:887 +#: ../lib/application.vala:118 ../lib/application.vala:133 +#: ../src/xfce4-notes-settings.c:223 ../src/xfce4-notes-settings.c:231 +msgid "Select notes path" +msgstr "Vælg notesti" + +#: ../lib/application.vala:119 +#, c-format +msgid "The selected directory (%s) for the new notes path already contains files. You must select or create an empty directory." +msgstr "Den valgte mappe (%s) for de nye noter indeholder allerede filer. Du er nødt til at vælge eller oprette en tom mappe." + +#: ../lib/application.vala:134 +#, c-format +msgid "Unable to select directory for new notes path: %s" +msgstr "Kunne ikke vælge mappe for ny notesti: %s" + +#: ../lib/application.vala:187 ../lib/window.vala:887 #, c-format msgid "Notes %d" msgstr "Noter %d" -#: ../lib/application.vala:365 +#: ../lib/application.vala:411 msgid "Rename group" msgstr "Omdøb gruppe" -#: ../lib/application.vala:386 ../lib/window.vala:1009 +#: ../lib/application.vala:432 ../lib/window.vala:1009 #, c-format msgid "The name %s is already in use" msgstr "Navnet %s er allerede i brug" -#: ../lib/application.vala:412 +#: ../lib/application.vala:458 msgid "Are you sure you want to delete this group?" msgstr "Er du sikker på, at du vil slette denne gruppe?" -#: ../lib/application.vala:469 +#: ../lib/application.vala:515 #, c-format msgid "The name \"%s\" is invalid." msgstr "Navnet \"%s\" er ugyldigt." -#: ../lib/application.vala:470 +#: ../lib/application.vala:516 #, c-format msgid "The invalid characters are: %s" msgstr "Det ugyldige tegn er: %s" -#: ../lib/application.vala:527 +#: ../lib/application.vala:573 msgid "Unable to open the settings dialog" msgstr "Kunne ikke åbne indstillingsvinduet" -#: ../lib/application.vala:572 +#: ../lib/application.vala:618 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -77,7 +92,7 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk"; -#: ../lib/application.vala:607 ../lib/window.vala:751 +#: ../lib/application.vala:653 ../lib/window.vala:751 msgid "_Add a new group" msgstr "_Tilføj en ny gruppe" @@ -100,7 +115,7 @@ msgid "_Rename" msgstr "_Omdøb" #. Always on top -#: ../lib/window.vala:657 ../src/xfce4-notes-settings.c:171 +#: ../lib/window.vala:657 ../src/xfce4-notes-settings.c:185 msgid "Always on top" msgstr "Altid øverst" @@ -124,121 +139,125 @@ msgstr "Er du sikker på, at du vil slette denne note?" msgid "Rename note" msgstr "Omdøb note" -#: ../src/xfce4-notes-settings.c:99 +#: ../src/xfce4-notes-settings.c:103 msgid "Configure the plugin" msgstr "Indstil udvidelsesmodulet" -#: ../src/xfce4-notes-settings.c:118 +#: ../src/xfce4-notes-settings.c:122 msgid "Global settings" msgstr "Globale indstillinger" #. Hide from taskbar -#: ../src/xfce4-notes-setting
[Xfce4-commits] Show notifications when checking mail for unread messages
Updating branch refs/heads/master to 33699ee2fac3bd6128010bec09e0de0d4f57d140 (commit) from e123c8289a77b480a4fccf325ae80e87e458c526 (commit) commit 33699ee2fac3bd6128010bec09e0de0d4f57d140 Author: Bernd Prünster Date: Tue Nov 16 00:13:28 2010 +0100 Show notifications when checking mail for unread messages Fixes: https://bugs.launchpad.net/postler/+bug/671538 postler/postler-bureau.vala |2 ++ postler/postler-folders.vala | 11 +++ postler/wscript_build|4 ++-- wscript |1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala index 9be0732..d2e4e06 100644 --- a/postler/postler-bureau.vala +++ b/postler/postler-bureau.vala @@ -90,11 +90,13 @@ public class Postler.Bureau : Gtk.Window { private bool new_message_timer () { accounts.receive (); +folders.display_notify = true; return true; } void action_mail_receive () { accounts.receive (); +folders.display_notify = true; } void compose_message (string? prefix=null, string? recipient=null) { diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala index 2386d75..015e32d 100644 --- a/postler/postler-folders.vala +++ b/postler/postler-folders.vala @@ -32,6 +32,8 @@ public class Postler.Folders : Gtk.TreeView { return null; } } +public bool display_notify { get; set; default = false; } + public Postler.AccountInfo? get_selected_account () { return_val_if_fail (messages != null, null); Gtk.TreeIter iter; @@ -55,6 +57,7 @@ public class Postler.Folders : Gtk.TreeView { public Folders (Accounts accounts) { this.accounts = accounts; +Notify.init ("Postler"); store = new Gtk.TreeStore (7, typeof (string), typeof (string), typeof (string), typeof (AccountInfo), @@ -86,6 +89,14 @@ public class Postler.Folders : Gtk.TreeView { if (store.get_iter_from_string (out iter, path)) store.set (iter, Columns.NAME, "%s (%d)".printf (account, unread)); +if (unread > 0 && display_notify) { +var notification = new Notify.Notification ("Postler", +ngettext ("You have a %d message", +"You have %d new messages", unread).printf (unread), +STOCK_INTERNET_MAIL, null); +notification.show (); +display_notify = false; +} } catch (GLib.Error error) { GLib.critical (_("Failed to monitor folder \"%s\": %s"), msg_dir.get_path (), error.message); diff --git a/postler/wscript_build b/postler/wscript_build index 0e85405..aa7b5cf 100644 --- a/postler/wscript_build +++ b/postler/wscript_build @@ -13,7 +13,7 @@ obj.name = 'postler' obj.target = 'postler' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'GIO GTHREAD GTK UNIQUE WEBKIT' -obj.packages = 'config postler posix gio-2.0 gtk+-2.0 unique-1.0 webkit-1.0' +obj.uselib = 'GIO GTHREAD GTK UNIQUE WEBKIT LIBNOTIFY' +obj.packages = 'config postler posix gio-2.0 gtk+-2.0 libnotify unique-1.0 webkit-1.0' obj.vapi_dirs = '.' diff --git a/wscript b/wscript index e7e61c0..8a8ce5c 100644 --- a/wscript +++ b/wscript @@ -111,6 +111,7 @@ def configure (conf): check_pkg ('unique-1.0', '0.9') check_pkg ('gtk+-2.0', '2.12.0', var='GTK') check_pkg ('webkit-1.0', '1.1.1') +check_pkg ('libnotify', var='LIBNOTIFY') # isync conf.check (header_name='sys/filio.h') ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Play sound when there are new messages
Updating branch refs/heads/master to 1d6ba3c504fbd833b7b3147e33f91cbfc182da3c (commit) from 33699ee2fac3bd6128010bec09e0de0d4f57d140 (commit) commit 1d6ba3c504fbd833b7b3147e33f91cbfc182da3c Author: Christian Dywan Date: Tue Nov 16 02:38:24 2010 +0100 Play sound when there are new messages postler/postler-folders.vala |8 postler/wscript_build|4 ++-- wscript |1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala index 015e32d..4470125 100644 --- a/postler/postler-folders.vala +++ b/postler/postler-folders.vala @@ -78,6 +78,13 @@ public class Postler.Folders : Gtk.TreeView { { "Archive", STOCK_ARCHIVE, N_("Archive") } }; +static Canberra.Context sound_context = null; +void play_sound (string sound) { +if (sound_context == null) +Canberra.Context.create (out sound_context); +sound_context.play (0, Canberra.PROP_EVENT_ID, sound); +} + void unread_monitor_changed (File msg_dir, string path, string account) { try { var msg_enumerator = msg_dir.enumerate_children ("", 0, null); @@ -95,6 +102,7 @@ public class Postler.Folders : Gtk.TreeView { "You have %d new messages", unread).printf (unread), STOCK_INTERNET_MAIL, null); notification.show (); +play_sound ("message-new-email"); display_notify = false; } } catch (GLib.Error error) { diff --git a/postler/wscript_build b/postler/wscript_build index aa7b5cf..4e9051d 100644 --- a/postler/wscript_build +++ b/postler/wscript_build @@ -13,7 +13,7 @@ obj.name = 'postler' obj.target = 'postler' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'GIO GTHREAD GTK UNIQUE WEBKIT LIBNOTIFY' -obj.packages = 'config postler posix gio-2.0 gtk+-2.0 libnotify unique-1.0 webkit-1.0' +obj.uselib = 'GIO GTHREAD GTK LIBNOTIFY LIBCANBERRA UNIQUE WEBKIT' +obj.packages = 'config postler posix gio-2.0 gtk+-2.0 libnotify libcanberra unique-1.0 webkit-1.0' obj.vapi_dirs = '.' diff --git a/wscript b/wscript index 8a8ce5c..1866f0b 100644 --- a/wscript +++ b/wscript @@ -112,6 +112,7 @@ def configure (conf): check_pkg ('gtk+-2.0', '2.12.0', var='GTK') check_pkg ('webkit-1.0', '1.1.1') check_pkg ('libnotify', var='LIBNOTIFY') +check_pkg ('libcanberra', var='LIBCANBERRA') # isync conf.check (header_name='sys/filio.h') ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits