[Xfce4-commits] postler:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to aa9c0e8a86f67128f440057515e867ff66f30aee (commit) from d75c16053a3dbd02a7f5d9316b8afda06c6e5cf8 (commit) commit aa9c0e8a86f67128f440057515e867ff66f30aee Author: Masato Hashimoto hash...@xfce.org Date: Sat Jun 4 08:02:09 2011 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 279 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 263 +- 1 files changed, 140 insertions(+), 123 deletions(-) diff --git a/po/ja.po b/po/ja.po index cf47487..6a8f756 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: Postler 1.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-04-24 18:34+0900\n -PO-Revision-Date: 2011-04-24 18:37+0900\n +POT-Creation-Date: 2011-06-04 14:53+0900\n +PO-Revision-Date: 2011-06-04 15:00+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese\n Language: ja\n @@ -28,14 +28,14 @@ msgstr メールリーダ #: ../data/postler.desktop.in.h:3 #: ../postler/postler-reader.vala:42 -#: ../postler/postler-service.vala:178 +#: ../postler/postler-service.vala:280 msgid Postler msgstr Postler #: ../postler/postler-accounts.vala:70 #: ../postler/postler-accounts.vala:202 -#: ../postler/postler-folders.vala:496 -#: ../postler/postler-service.vala:244 +#: ../postler/postler-folders.vala:495 +#: ../postler/postler-service.vala:345 msgid Inbox msgstr 受信箱 @@ -130,12 +130,12 @@ msgid Mail folder couldn't be created. msgstr メールフォルダを作成できませんでした。 #: ../postler/postler-accountsetup.vala:64 -msgid _Header -msgstr ヘッダ(_H) +msgid _Header: +msgstr ヘッダ(_H): #: ../postler/postler-accountsetup.vala:67 -msgid _Keywords -msgstr キーワード(_K) +msgid _Keywords: +msgstr キーワード(_K): #: ../postler/postler-accountsetup.vala:77 msgid Firstname Lastname @@ -461,7 +461,7 @@ msgid _View msgstr 表示(_V) #: ../postler/postler-bureau.vala:474 -#: ../postler/postler-content.vala:300 +#: ../postler/postler-content.vala:296 msgid _Enlarge Text msgstr 文字を大きく(_E) @@ -470,7 +470,7 @@ msgid Enlarge message text msgstr メッセージの文字を大きくします #: ../postler/postler-bureau.vala:476 -#: ../postler/postler-content.vala:307 +#: ../postler/postler-content.vala:303 msgid Sh_rink Text msgstr 文字を小さく(_R) @@ -491,7 +491,7 @@ msgid View the message in fullscreen msgstr メッセージをフルスクリーンで表示します #: ../postler/postler-bureau.vala:482 -#: ../postler/postler-content.vala:320 +#: ../postler/postler-content.vala:316 msgid View _Source msgstr ソースの表示(_S) @@ -583,7 +583,7 @@ msgid %s: %s msgstr %s: %s #: ../postler/postler-bureau.vala:600 -#: ../postler/postler-service.vala:388 +#: ../postler/postler-service.vala:505 msgid Can't verify mail server authenticity. msgstr メールサーバの認証ができません。 @@ -592,7 +592,7 @@ msgid Fetch Without Verifying msgstr 認証なしに受信する #: ../postler/postler-bureau.vala:611 -#: ../postler/postler-service.vala:421 +#: ../postler/postler-service.vala:538 #, c-format msgid Account \%s\ doesn't exist msgstr アカウント \%s\ は存在しません @@ -838,167 +838,154 @@ msgstr ファイル %s が存在しません msgid Error converting HTML to text: %s msgstr HTML からテキストへの変換でエラーが発生しました: %s -#: ../postler/postler-content.vala:266 +#: ../postler/postler-content.vala:262 msgid Copy _Address msgstr アドレスをコピー(_A) -#: ../postler/postler-content.vala:288 +#: ../postler/postler-content.vala:284 msgid Copy _Filename msgstr ファイル名をコピー(_F) -#: ../postler/postler-content.vala:431 +#: ../postler/postler-content.vala:427 #, c-format msgid Failed to decode string \%s\: %s msgstr 文字列 \%s\ のデコードに失敗しました: %s # 今日のhh時mm分ss秒 -#: ../postler/postler-content.vala:450 +#: ../postler/postler-content.vala:446 msgid Today msgstr 今日の # 昨日のhh時mm分ss秒 -#: ../postler/postler-content.vala:452 +#: ../postler/postler-content.vala:448 msgid Yesterday msgstr 昨日の # %m月%e日 hh時mm分ss秒 #. i18n: strftime format for full month name and day number -#: ../postler/postler-content.vala:455 +#: ../postler/postler-content.vala:451 msgid %B %e msgstr %m月%e日 # %Y年%m月%e日 hh時mm分ss秒 #. i18n: strftime format for full month name, day number and year -#: ../postler/postler-content.vala:458 +#: ../postler/postler-content.vala:454 msgid %B %e, %Y msgstr %Y年%m月%e日 -#: ../postler/postler-content.vala:487 +#: ../postler/postler-content.vala:478 #, c-format msgid On %s, %s wrote: msgstr %s に %s さんは書きました: -#: ../postler/postler-content.vala:553 +#: ../postler/postler-content.vala:544 #, c-format msgid Failed to quote message \%s\: %s msgstr メッセージ \%s\ を引用にできませんでした: %s -#: ../postler/postler-content.vala:641 -#: ../postler/postler-content.vala:661 +#: ../postler/postler-content.vala:632 +#: ../postler/postler-content.vala:652 #, c-format msgid Source Code: %s msgstr ソースコード: %s -#: ../postler/postler-content.vala:666 +#: ../postler/postler-content.vala:657 #, c-format msgid Failed to
[Xfce4-commits] midori:master l10n: Updated Italian (it) translation to 99%
Updating branch refs/heads/master to 89f3caca4aadb4128c0bd7ea277d57dd66f1d4fe (commit) from 90885576affcdcf3b4b9cc208bf0a18e37dd7f6c (commit) commit 89f3caca4aadb4128c0bd7ea277d57dd66f1d4fe Author: Cristian Marchi cri.pe...@gmail.com Date: Sat Jun 4 09:17:05 2011 +0200 l10n: Updated Italian (it) translation to 99% New status: 664 messages complete with 1 fuzzy and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 22 ++ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/po/it.po b/po/it.po index 38da4d1..ba5c5e3 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: midori 0.1.7\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-06-02 04:18+\n +POT-Creation-Date: 2011-06-04 04:18+\n PO-Revision-Date: 2010-11-05 21:04+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian xfce-it-translat...@googlegroups.com\n @@ -220,11 +220,11 @@ msgstr SECONDI #: ../midori/main.c:1968 msgid Redirects console warnings to the specified FILENAME -msgstr +msgstr Redirige gli avvisi di console al NOMEFILE specificato #: ../midori/main.c:1968 msgid FILENAME -msgstr +msgstr NOMEFILE #: ../midori/main.c:2052 msgid [Addresses] @@ -250,7 +250,7 @@ msgstr Icone dei siti #. i18n: Logins and passwords in websites and web forms #: ../midori/main.c:2170 msgid Saved logins and _passwords -msgstr +msgstr _Password e login salvati #: ../midori/main.c:2172 msgid Cookies @@ -608,9 +608,8 @@ msgid Open a new tab msgstr Apre una nuova scheda #: ../midori/midori-browser.c:5074 -#, fuzzy msgid New P_rivate Browsing Window -msgstr Navi_gazione privata +msgstr Nuova _finestra di navigazione privata #: ../midori/midori-browser.c:5075 msgid Don't save any private data while browsing @@ -950,11 +949,11 @@ msgstr Posiziona il fuoco sulla scheda corrente #: ../midori/midori-browser.c:5267 msgid Focus _Next view -msgstr +msgstr Metti a fuoco la vista _successiva #: ../midori/midori-browser.c:5268 msgid Cycle focus between views -msgstr +msgstr Scorre il fuoco tra le viste #: ../midori/midori-browser.c:5270 msgid Only show the Icon of the _Current Tab @@ -1690,12 +1689,12 @@ msgstr I dati selezionati per la cancellazione #. i18n: Reworded: Shorten details propagated when going to another page #: ../midori/midori-websettings.c:1002 msgid Strip referrer details sent to websites -msgstr +msgstr Scarta i dettagli del referer inviati ai siti web #. i18n: Referer here is not a typo but a technical term #: ../midori/midori-websettings.c:1004 msgid Whether the \Referer\ header should be shortened to the hostname -msgstr +msgstr Se il \referer\ deve essere accorciato al nome host #: ../midori/midori-view.c:1365 #, c-format @@ -1954,9 +1953,8 @@ msgid Startup msgstr Avvio #: ../midori/midori-preferences.c:307 -#, fuzzy msgid Use _current page -msgstr Stampa la pagina corrente +msgstr Usa la pagina co_rrente #: ../midori/midori-preferences.c:311 msgid Use current page as homepage ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Use exo preferred directly to open uris (bug #7140).
Updating branch refs/heads/master
to c5cbf887baa8f4ffb0b205b2c69d031efd9a2367 (commit)
from 1c93421c73f6d724f2d09bc54ab3a8d73c3fe69a (commit)
commit c5cbf887baa8f4ffb0b205b2c69d031efd9a2367
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 10:12:09 2011 +0200
Use exo preferred directly to open uris (bug #7140).
gtk_uri_show is not reliable, so use exo directly to open
links and email addresses.
terminal/terminal-widget.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index dac2df8..7087516 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -659,10 +659,11 @@ terminal_widget_open_uri (TerminalWidget *widget,
const gchar*wlink,
ginttag)
{
- GError*error = NULL;
- gchar *uri;
- guint i;
- GdkScreen *screen;
+ GError *error = NULL;
+ gchar *uri;
+ guinti;
+ GdkScreen *screen;
+ const gchar *category = WebBrowser;
for (i = 0; i G_N_ELEMENTS (regex_patterns); i++)
{
@@ -682,6 +683,9 @@ terminal_widget_open_uri (TerminalWidget *widget,
break;
case PATTERN_TYPE_EMAIL:
+/* other category then WebBrowser */
+category = MailReader;
+
if (strncmp (wlink, mailto:;, 7) == 0)
uri = g_strdup (wlink);
else
@@ -694,11 +698,7 @@ terminal_widget_open_uri (TerminalWidget *widget,
/* try to open the URI with the responsible application */
screen = gtk_widget_get_screen (GTK_WIDGET (widget));
-#if EXO_CHECK_VERSION (0, 5, 0)
- if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), error))
-#else
- if (!exo_url_show_on_screen (uri, NULL, screen, error))
-#endif
+ if (!exo_execute_preferred_application_on_screen (category, uri, NULL,
NULL, screen, error))
{
/* tell the user that we were unable to open the responsible
application */
terminal_dialogs_show_error (widget, error, _(Failed to open the
URL `%s'), uri);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Fix preferred applications handling (bug #7140).
Updating branch refs/heads/master
to 41b00df8433e832f9cee43d596dc16bf8d56971c (commit)
from 4414a31fc8bc0764fc4228b8ec64b5c7e0e5d124 (commit)
commit 41b00df8433e832f9cee43d596dc16bf8d56971c
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 12:46:26 2011 +0200
Fix preferred applications handling (bug #7140).
I broke the writing in mimeapps.list after removing the
mimetypes keys from the desktop files in commit 2e3744b.
So restore them again as X-XFCE-MimeType.
exo-helper/exo-helper.c |2 +-
exo-open/exo-file-manager.desktop.in |1 +
exo-open/exo-mail-reader.desktop.in |1 +
exo-open/exo-web-browser.desktop.in |2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/exo-helper/exo-helper.c b/exo-helper/exo-helper.c
index 3fe7229..161477b 100644
--- a/exo-helper/exo-helper.c
+++ b/exo-helper/exo-helper.c
@@ -731,7 +731,7 @@ exo_helper_database_set_default (ExoHelperDatabase
*database,
if (G_UNLIKELY (desktop_file != NULL))
{
xfce_rc_set_group (desktop_file, Desktop Entry);
- mimetypes = xfce_rc_read_list_entry (desktop_file, MimeType, ;);
+ mimetypes = xfce_rc_read_list_entry (desktop_file, X-XFCE-MimeType,
;);
if (mimetypes != NULL)
{
xfce_rc_set_group (rc, Added Associations);
diff --git a/exo-open/exo-file-manager.desktop.in
b/exo-open/exo-file-manager.desktop.in
index ca4aedf..3d7653e 100644
--- a/exo-open/exo-file-manager.desktop.in
+++ b/exo-open/exo-file-manager.desktop.in
@@ -7,5 +7,6 @@ StartupNotify=true
Terminal=false
Categories=Utility;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/file;x-scheme-handler/trash;
_Name=File Manager
_Comment=Browse the file system
diff --git a/exo-open/exo-mail-reader.desktop.in
b/exo-open/exo-mail-reader.desktop.in
index 541de0d..511fff7 100644
--- a/exo-open/exo-mail-reader.desktop.in
+++ b/exo-open/exo-mail-reader.desktop.in
@@ -7,5 +7,6 @@ StartupNotify=false
Terminal=false
Categories=Network;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/mailto;
_Name=Mail Reader
_Comment=Read your email
diff --git a/exo-open/exo-web-browser.desktop.in
b/exo-open/exo-web-browser.desktop.in
index 65870e5..49f31eb 100644
--- a/exo-open/exo-web-browser.desktop.in
+++ b/exo-open/exo-web-browser.desktop.in
@@ -7,6 +7,6 @@ StartupNotify=false
Terminal=false
Categories=Network;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
_Name=Web Browser
_Comment=Browse the web
-
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:xfce-4.8 Fix preferred applications handling (bug #7140).
Updating branch refs/heads/xfce-4.8
to a1c52f8b557b9ebd0e2b89cac70cd6cd9346ae5b (commit)
from d5048bb865362b2265c467b3f730f4bb6707b97c (commit)
commit a1c52f8b557b9ebd0e2b89cac70cd6cd9346ae5b
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 12:46:26 2011 +0200
Fix preferred applications handling (bug #7140).
I broke the writing in mimeapps.list after removing the
mimetypes keys from the desktop files in commit 2e3744b.
So restore them again as X-XFCE-MimeType.
(cherry picked from commit 41b00df8433e832f9cee43d596dc16bf8d56971c)
exo-helper/exo-helper.c |2 +-
exo-open/exo-file-manager.desktop.in |1 +
exo-open/exo-mail-reader.desktop.in |1 +
exo-open/exo-web-browser.desktop.in |2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/exo-helper/exo-helper.c b/exo-helper/exo-helper.c
index 3fe7229..161477b 100644
--- a/exo-helper/exo-helper.c
+++ b/exo-helper/exo-helper.c
@@ -731,7 +731,7 @@ exo_helper_database_set_default (ExoHelperDatabase
*database,
if (G_UNLIKELY (desktop_file != NULL))
{
xfce_rc_set_group (desktop_file, Desktop Entry);
- mimetypes = xfce_rc_read_list_entry (desktop_file, MimeType, ;);
+ mimetypes = xfce_rc_read_list_entry (desktop_file, X-XFCE-MimeType,
;);
if (mimetypes != NULL)
{
xfce_rc_set_group (rc, Added Associations);
diff --git a/exo-open/exo-file-manager.desktop.in
b/exo-open/exo-file-manager.desktop.in
index ca4aedf..3d7653e 100644
--- a/exo-open/exo-file-manager.desktop.in
+++ b/exo-open/exo-file-manager.desktop.in
@@ -7,5 +7,6 @@ StartupNotify=true
Terminal=false
Categories=Utility;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/file;x-scheme-handler/trash;
_Name=File Manager
_Comment=Browse the file system
diff --git a/exo-open/exo-mail-reader.desktop.in
b/exo-open/exo-mail-reader.desktop.in
index 541de0d..511fff7 100644
--- a/exo-open/exo-mail-reader.desktop.in
+++ b/exo-open/exo-mail-reader.desktop.in
@@ -7,5 +7,6 @@ StartupNotify=false
Terminal=false
Categories=Network;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/mailto;
_Name=Mail Reader
_Comment=Read your email
diff --git a/exo-open/exo-web-browser.desktop.in
b/exo-open/exo-web-browser.desktop.in
index 65870e5..49f31eb 100644
--- a/exo-open/exo-web-browser.desktop.in
+++ b/exo-open/exo-web-browser.desktop.in
@@ -7,6 +7,6 @@ StartupNotify=false
Terminal=false
Categories=Network;X-XFCE;X-Xfce-Toplevel;
OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
_Name=Web Browser
_Comment=Browse the web
-
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Fix typo in German translation (bug #6654).
Updating branch refs/heads/master to b4725259ec1d88bf45fc8864a130973df84ce945 (commit) from c5cbf887baa8f4ffb0b205b2c69d031efd9a2367 (commit) commit b4725259ec1d88bf45fc8864a130973df84ce945 Author: Nick Schermer n...@xfce.org Date: Sat Jun 4 12:56:10 2011 +0200 Fix typo in German translation (bug #6654). po/de.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 2d6c9a6..9109976 100644 --- a/po/de.po +++ b/po/de.po @@ -567,7 +567,7 @@ msgstr Den ausgewählten Text einfügen #: ../terminal/terminal-window.c:227 msgid _Toolbars... -msgstr _Werzeugleisten... +msgstr _Werkzeugleisten... #: ../terminal/terminal-window.c:227 msgid Customize the toolbars ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:jeromeg/webkit-thumbnailer Improve WebView settings.
Updating branch refs/heads/jeromeg/webkit-thumbnailer to cd054a39c1953fc3b785530d7fd229f8558213e9 (commit) from 31bd1c5efc7538a845cd27f139875719e38987ff (commit) commit cd054a39c1953fc3b785530d7fd229f8558213e9 Author: Jérôme Guelfucci jero...@xfce.org Date: Sat Jun 4 11:42:47 2011 +0200 Improve WebView settings. plugins/webkit-thumbnailer/webkit-thumbnailer.c |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c b/plugins/webkit-thumbnailer/webkit-thumbnailer.c index e30559e..2a73a4e 100644 --- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c +++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c @@ -141,11 +141,14 @@ webkit_thumbnailer_init (WebkitThumbnailer *thumbnailer) /* disable plugins, javascript, java and html5 local features */ g_object_set (G_OBJECT(settings), -enable-scripts, FALSE, -enable-plugins, FALSE, +auto-resize-window, FALSE, enable-html5-database, FALSE, enable-html5-local-storage, FALSE, enable-java-applet, FALSE, +enable-plugins, FALSE, +enable-private-browsing, TRUE, +enable-scripts, FALSE, +enable-universal-access-from-file-uris, FALSE, NULL); /* apply the result to the web view */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:jeromeg/webkit-thumbnailer Increase load timeout.
Updating branch refs/heads/jeromeg/webkit-thumbnailer to 900a5f52a925bfb6db5cdcc4e03e9add6db052e8 (commit) from cd054a39c1953fc3b785530d7fd229f8558213e9 (commit) commit 900a5f52a925bfb6db5cdcc4e03e9add6db052e8 Author: Jérôme Guelfucci jero...@xfce.org Date: Sat Jun 4 13:32:31 2011 +0200 Increase load timeout. plugins/webkit-thumbnailer/webkit-thumbnailer.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c b/plugins/webkit-thumbnailer/webkit-thumbnailer.c index 2a73a4e..f79dcfe 100644 --- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c +++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c @@ -36,7 +36,7 @@ -#define LOAD_TIMEOUT 1000 +#define LOAD_TIMEOUT 3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:jeromeg/webkit-thumbnailer Use Webkit document viewer cache model.
Updating branch refs/heads/jeromeg/webkit-thumbnailer to 31bd1c5efc7538a845cd27f139875719e38987ff (commit) from 7694090c4e0046282ffc30ea2efbb0aacacf2fac (commit) commit 31bd1c5efc7538a845cd27f139875719e38987ff Author: Jérôme Guelfucci jero...@xfce.org Date: Fri Jun 3 17:43:55 2011 +0200 Use Webkit document viewer cache model. This will reduce the memory usage by using less aggressive caching which we don't need. plugins/webkit-thumbnailer/webkit-thumbnailer.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c b/plugins/webkit-thumbnailer/webkit-thumbnailer.c index cfff3cb..e30559e 100644 --- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c +++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c @@ -136,6 +136,9 @@ webkit_thumbnailer_init (WebkitThumbnailer *thumbnailer) /* create a new websettings and disable potential threats */ settings = webkit_web_settings_new (); + /* Set document viewer cache model to reduce memory usage */ + webkit_set_cache_model (WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); + /* disable plugins, javascript, java and html5 local features */ g_object_set (G_OBJECT(settings), enable-scripts, FALSE, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:jeromeg/webkit-thumbnailer Stop loading when the timeout is elapsed.
Updating branch refs/heads/jeromeg/webkit-thumbnailer
to 3c65a449a6905782dc5230499b5f6f74ce9bf250 (commit)
from 5da5de92e1d68f3a2ba64cd8fea3286f52c037c6 (commit)
commit 3c65a449a6905782dc5230499b5f6f74ce9bf250
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Jun 4 13:41:48 2011 +0200
Stop loading when the timeout is elapsed.
plugins/webkit-thumbnailer/webkit-thumbnailer.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
index 4314091..b0b6a02 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
@@ -238,6 +238,8 @@ generate_pixbuf (GdkPixbuf *source,
static gboolean
cb_load_timeout (gpointer data)
{
+ webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (WEBKIT_THUMBNAILER
(data)-view));
+
gtk_main_quit ();
return FALSE;
@@ -283,7 +285,8 @@ webkit_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
/* schedule a timeout to avoid waiting forever if the page fails to
* load */
- timeout_id = g_timeout_add_seconds (LOAD_TIMEOUT, cb_load_timeout, NULL);
+ timeout_id =
+g_timeout_add_seconds (LOAD_TIMEOUT, cb_load_timeout, webkit_thumbnailer);
/* load the page in the web view */
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (webkit_thumbnailer-view), uri);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:jeromeg/webkit-thumbnailer Use notify::load-status signal to handle page load.
Updating branch refs/heads/jeromeg/webkit-thumbnailer
to 9e139130c65f0324663496f01d3432b67902eb00 (commit)
from 3c65a449a6905782dc5230499b5f6f74ce9bf250 (commit)
commit 9e139130c65f0324663496f01d3432b67902eb00
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Jun 4 14:26:48 2011 +0200
Use notify::load-status signal to handle page load.
This allows us to also handle errors on page loading which was not done
before.
plugins/webkit-thumbnailer/webkit-thumbnailer.c | 38 +++---
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
index b0b6a02..f490dd9 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
@@ -119,17 +119,31 @@ cb_view_loaded_idle (gpointer webkit_thumbnailer)
static void
-cb_view_load_finished (GtkWidget *web_view,
- WebKitWebFrame*web_frame,
- WebkitThumbnailer *thumbnailer)
+cb_view_load_status (GtkWidget *web_view,
+ GParamSpec*pspec,
+ WebkitThumbnailer *thumbnailer)
{
- /* force a redraw of the offscreen window to make sure we snapshot
- * the latest visual changes */
- gtk_widget_queue_draw (thumbnailer-view);
- gdk_window_process_updates (gtk_widget_get_window (thumbnailer-offscreen),
- TRUE);
-
- g_idle_add (cb_view_loaded_idle, thumbnailer);
+ switch (webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (web_view)))
+{
+ case WEBKIT_LOAD_FINISHED:
+/* force a redraw of the offscreen window to make sure we snapshot
+ * the latest visual changes */
+gtk_widget_queue_draw (thumbnailer-view);
+gdk_window_process_updates (gtk_widget_get_window
(thumbnailer-offscreen),
+TRUE);
+
+/* capture the web view content in an idle handler */
+g_idle_add (cb_view_loaded_idle, thumbnailer);
+break;
+
+ case WEBKIT_LOAD_FAILED:
+/* exit the main loop, an error will be returned */
+gtk_main_quit ();
+break;
+
+ default:
+break;
+}
}
@@ -171,8 +185,8 @@ webkit_thumbnailer_init (WebkitThumbnailer *thumbnailer)
/* signal to retrieve thumbnails once the page is loaded */
g_signal_connect (thumbnailer-view,
-load-finished,
-G_CALLBACK (cb_view_load_finished),
+notify::load-status,
+G_CALLBACK (cb_view_load_status),
thumbnailer);
gtk_container_add (GTK_CONTAINER (thumbnailer-offscreen),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Index the id's of thread references of all messages
Updating branch refs/heads/master
to 712a9b0fbcf687e343272c8a413b95431993e427 (commit)
from aa9c0e8a86f67128f440057515e867ff66f30aee (commit)
commit 712a9b0fbcf687e343272c8a413b95431993e427
Author: Christian Dywan christ...@twotoasts.de
Date: Mon May 30 20:17:00 2011 +0200
Index the id's of thread references of all messages
postler/postler-index.vala |8 +---
postler/postler-message.vala | 22 ++
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index 5209a58..5cc0751 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -43,7 +43,8 @@ namespace Postler {
if (database.exec (
CREATE TABLE IF NOT EXISTS
-messages (id TEXT, uri TEXT, subject TEXT, sender TEXT,
recipients TEXT,
+messages (id TEXT, uri TEXT, threads TEXT,
+ subject TEXT, sender TEXT, recipients TEXT,
unread BOOLEAN, flagged BOOLEAN,
forwarded BOOLEAN, replied BOOLEAN, priority BOOLEAN,
date INTEGER, timestamp INTEGER, excerpt TEXT);
@@ -57,8 +58,8 @@ namespace Postler {
if (database.prepare_v2 (
INSERT INTO messages
(uri, subject, sender, recipients,
- unread, flagged, forwarded, replied, priority, date, id,
timestamp)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)
+ unread, flagged, forwarded, replied, priority, date, id,
timestamp, threads)
+VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12,
?13)
,
-1, out statement_insert) != Sqlite.OK)
throw new GLib.FileError.FAILED (_(Failed to index
message: %s), database.errmsg ());
@@ -76,6 +77,7 @@ namespace Postler {
statement_insert.bind_int64 (10, message.get_timestamp ()) ==
Sqlite.OK
statement_insert.bind_text (11, message.id) == Sqlite.OK
statement_insert.bind_int64 (12, startup_timestamp) ==
Sqlite.OK
+ statement_insert.bind_text (13, message.threads, -1) ==
Sqlite.OK
statement_insert.step () == Sqlite.DONE;
statement_insert.reset ();
if (!success)
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index b5c7b3b..3a237f4 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -23,6 +23,7 @@ namespace Postler {
public string? uri { public get; set; }
public string get_path () { return GLib.File.new_for_uri
(uri).get_path (); }
public string? id { public get; set; }
+public string? threads { public get; set; }
string? charset = null;
public string get_charset () { return charset ?? ISO-8859-1; }
public GLib.DateTime? date { public get; set; }
@@ -158,6 +159,27 @@ namespace Postler {
if (message_id.has_prefix () message_id.has_suffix
())
id = message_id.slice (1, -1);
}
+else if (field == in-reply-to) {
+string message_id = parts[1].strip ();
+if (message_id.has_prefix () message_id.has_suffix
()) {
+if (threads != null)
+threads += , + message_id.slice (1, -1);
+else
+threads = message_id.slice (1, -1);
+}
+}
+else if (field == references) {
+string[] message_ids = parts[1].split_set (, \t);
+string[] parsed_ids = {};
+foreach (string message_id in message_ids) {
+if (message_id.has_prefix ()
message_id.has_suffix ())
+parsed_ids += message_id.slice (1, -1);
+}
+if (threads != null)
+threads = string.joinv (,, parsed_ids) + , +
threads;
+else
+threads = string.joinv (,, parsed_ids);
+}
else if (field == subject)
subject = parse_encoded (parts[1], out charset);
else if (field == from) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Index bugzilla and launchpad project names
Updating branch refs/heads/master
to 0632d13cb32fdd26acc48180bba68bdf1e995803 (commit)
from 712a9b0fbcf687e343272c8a413b95431993e427 (commit)
commit 0632d13cb32fdd26acc48180bba68bdf1e995803
Author: Christian Dywan christ...@twotoasts.de
Date: Mon May 30 20:29:00 2011 +0200
Index bugzilla and launchpad project names
Also consider bugzilla commenters as senders.
postler/postler-index.vala |8 +---
postler/postler-message.vala | 18 ++
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index 5cc0751..ce987ae 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -43,7 +43,7 @@ namespace Postler {
if (database.exec (
CREATE TABLE IF NOT EXISTS
-messages (id TEXT, uri TEXT, threads TEXT,
+messages (id TEXT, uri TEXT, threads TEXT, project TEXT,
subject TEXT, sender TEXT, recipients TEXT,
unread BOOLEAN, flagged BOOLEAN,
forwarded BOOLEAN, replied BOOLEAN, priority BOOLEAN,
@@ -58,8 +58,9 @@ namespace Postler {
if (database.prepare_v2 (
INSERT INTO messages
(uri, subject, sender, recipients,
- unread, flagged, forwarded, replied, priority, date, id,
timestamp, threads)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12,
?13)
+ unread, flagged, forwarded, replied, priority,
+ date, id, timestamp, threads, project)
+VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12,
?13, ?14)
,
-1, out statement_insert) != Sqlite.OK)
throw new GLib.FileError.FAILED (_(Failed to index
message: %s), database.errmsg ());
@@ -78,6 +79,7 @@ namespace Postler {
statement_insert.bind_text (11, message.id) == Sqlite.OK
statement_insert.bind_int64 (12, startup_timestamp) ==
Sqlite.OK
statement_insert.bind_text (13, message.threads, -1) ==
Sqlite.OK
+ statement_insert.bind_text (14, message.project, -1) ==
Sqlite.OK
statement_insert.step () == Sqlite.DONE;
statement_insert.reset ();
if (!success)
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index 3a237f4..db6ac11 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -39,6 +39,7 @@ namespace Postler {
public bool priority { public get; set; }
public string organization { public get; set; }
public string application { public get; set; }
+public string project { public get; set; }
GLib.HashTablestring,string fields = new
GLib.HashTablestring,string (str_hash, str_equal);
public string get_field (string field) { return fields.lookup (field);
}
GLib.DataInputStream? stream = null;
@@ -184,6 +185,11 @@ namespace Postler {
subject = parse_encoded (parts[1], out charset);
else if (field == from) {
string sender_charset = null;
+if (sender == null)
+sender = parse_encoded (parts[1], out sender_charset);
+}
+else if (field == x-bugzilla-who) {
+string sender_charset = null;
sender = parse_encoded (parts[1], out sender_charset);
}
else if (field == date) {
@@ -200,6 +206,18 @@ namespace Postler {
organization = parts[1];
else if (field == x-mailer || field == user-agent)
application = Postler.Content.format_x_mailer (parts[1]);
+else if (field == x-bugzilla-product || field ==
x-launchpad-bug) {
+/* Format:
+ X-Bugzilla-Product: gtk+
+ X-Launchpad-Bug: product=postler; status=Confirmed;
+ There can be multiple occurences of the Launchpad
header. */
+string stripped = parts[1].strip ();
+bool semicolon = stripped.str (; ) != null;
+if (stripped.has_prefix (product=) semicolon)
+project = stripped.split (;)[0].substring (8);
+else if (!semicolon)
+project = stripped;
+}
else if (field == reply-to) {
string field_charset = null;
reply_to = parse_encoded (parts[1], out field_charset);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Index mailing list names
Updating branch refs/heads/master
to 0b4ac5bfbcfa1045bf4921dfcde80593825c17cc (commit)
from 0632d13cb32fdd26acc48180bba68bdf1e995803 (commit)
commit 0b4ac5bfbcfa1045bf4921dfcde80593825c17cc
Author: Christian Dywan christ...@twotoasts.de
Date: Mon May 30 21:08:00 2011 +0200
Index mailing list names
postler/postler-index.vala |7 ---
postler/postler-message.vala |5 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index ce987ae..99531c2 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -43,7 +43,7 @@ namespace Postler {
if (database.exec (
CREATE TABLE IF NOT EXISTS
-messages (id TEXT, uri TEXT, threads TEXT, project TEXT,
+messages (id TEXT, uri TEXT, threads TEXT, project TEXT, list
TEXT,
subject TEXT, sender TEXT, recipients TEXT,
unread BOOLEAN, flagged BOOLEAN,
forwarded BOOLEAN, replied BOOLEAN, priority BOOLEAN,
@@ -59,8 +59,8 @@ namespace Postler {
INSERT INTO messages
(uri, subject, sender, recipients,
unread, flagged, forwarded, replied, priority,
- date, id, timestamp, threads, project)
-VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12,
?13, ?14)
+ date, id, timestamp, threads, project, list)
+VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12,
?13, ?14, ?15)
,
-1, out statement_insert) != Sqlite.OK)
throw new GLib.FileError.FAILED (_(Failed to index
message: %s), database.errmsg ());
@@ -80,6 +80,7 @@ namespace Postler {
statement_insert.bind_int64 (12, startup_timestamp) ==
Sqlite.OK
statement_insert.bind_text (13, message.threads, -1) ==
Sqlite.OK
statement_insert.bind_text (14, message.project, -1) ==
Sqlite.OK
+ statement_insert.bind_text (15, message.list, -1) == Sqlite.OK
statement_insert.step () == Sqlite.DONE;
statement_insert.reset ();
if (!success)
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index db6ac11..579ef90 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -40,6 +40,7 @@ namespace Postler {
public string organization { public get; set; }
public string application { public get; set; }
public string project { public get; set; }
+public string list { public get; set; }
GLib.HashTablestring,string fields = new
GLib.HashTablestring,string (str_hash, str_equal);
public string get_field (string field) { return fields.lookup (field);
}
GLib.DataInputStream? stream = null;
@@ -218,6 +219,10 @@ namespace Postler {
else if (!semicolon)
project = stripped;
}
+else if (field == list-id) {
+string field_charset = null;
+list = parse_encoded (parts[1], out field_charset);
+}
else if (field == reply-to) {
string field_charset = null;
reply_to = parse_encoded (parts[1], out field_charset);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Check that to is set before comparing to reply_to
Updating branch refs/heads/master
to 99f15c8cc2227665f5be42188991e278daf60f93 (commit)
from 0b4ac5bfbcfa1045bf4921dfcde80593825c17cc (commit)
commit 99f15c8cc2227665f5be42188991e278daf60f93
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 2 20:30:00 2011 +0200
Check that to is set before comparing to reply_to
postler/postler-message.vala |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index 579ef90..925ef99 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -245,7 +245,8 @@ namespace Postler {
Also Reply-To may equal From, which is at best confusing. */
if (reply_to != null) {
string canonical = Postler.Messages.parse_address
(reply_to)[1];
-if (canonical == Postler.Messages.parse_address (get_field
(to) ?? )[1])
+if (get_field (to) != null
+ canonical == Postler.Messages.parse_address (get_field
(to))[1])
reply_to = null;
else if (get_field (list-post) != null canonical ==
get_field (list-post))
reply_to = null;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Initialize HelperProcess.folder to non-null ??
Updating branch refs/heads/master
to 2682481ef7a06e1c6a3d895a94b442b1e1cb406f (commit)
from 99f15c8cc2227665f5be42188991e278daf60f93 (commit)
commit 2682481ef7a06e1c6a3d895a94b442b1e1cb406f
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 2 20:38:00 2011 +0200
Initialize HelperProcess.folder to non-null ??
An unset folder name is clearly a bug, but a bogus string
is preferrable over a crash.
postler/postler-service.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index 45731d5..0155162 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -13,7 +13,7 @@ namespace Postler {
internal class HelperProcess : Object {
internal string? display_name;
internal bool unverified;
-internal string? folder = null;
+internal string folder = ??;
string? command = null;
IOChannel inputc;
IOChannel errorc;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Count the number of messages without duplicates
Updating branch refs/heads/master
to 154243402d30f13eabee3176f32667c82a100f80 (commit)
from 1b3156812d94e4dddfb7923d54f42456a9c6b772 (commit)
commit 154243402d30f13eabee3176f32667c82a100f80
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 2 21:21:12 2011 +0200
Count the number of messages without duplicates
postler/postler-index.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index 99531c2..1c5d62c 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -147,7 +147,7 @@ namespace Postler {
public int64 unread_messages (string folder) throws GLib.Error {
if (statement_unread == null) {
if (database.prepare_v2 (
-SELECT COUNT (*) FROM messages WHERE uri LIKE ?1 AND
unread != 0
+SELECT COUNT (id) FROM (SELECT DISTINCT id FROM messages
WHERE uri LIKE ?1 AND unread != 0)
,
-1, out statement_unread) != Sqlite.OK)
throw new GLib.FileError.FAILED (_(Failed to count unread
messages: %s), database.errmsg ());
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Implement Unity.LauncherEntry interface
Updating branch refs/heads/master
to 1b3156812d94e4dddfb7923d54f42456a9c6b772 (commit)
from 2682481ef7a06e1c6a3d895a94b442b1e1cb406f (commit)
commit 1b3156812d94e4dddfb7923d54f42456a9c6b772
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 2 21:13:00 2011 +0200
Implement Unity.LauncherEntry interface
Expose Unread as a public property through DBus.
postler/postler-service.vala | 53 -
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index 0155162..8a906f2 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -98,10 +98,35 @@ namespace Postler {
internal signal void done (string error_message=);
}
+[DBus (name = com.canonical.Unity.LauncherEntry)]
+class LauncherEntry : Object {
+PostlerService service;
+
+public HashTablestring, Variant query () {
+var properties = new HashTablestring, Variant (str_hash,
str_equal);
+properties.insert (count, (int64)service.unread);
+properties.insert (count-visible, service.unread 0);
+properties.insert (progress, 0.0);
+properties.insert (progress-visible, false);
+properties.insert (urgent, false);
+return properties;
+}
+
+public signal void update (string app_uri, HashTablestring, Variant
properties);
+
+public LauncherEntry (PostlerService service) {
+this.service = service;
+service.notify[unread].connect ((object, pspec) = {
+update (application://postler.desktop, query ());
+});
+update (application://postler.desktop, query ());
+}
+}
+
[DBus (name = org.elementary.Postler)]
class PostlerService : Object {
double total = 0;
-int unread = 0;
+public int64 unread { get; set; default = 0; }
Dock.Item dockitem;
Index? index = null;
FileMonitor[] folder_monitors = {};
@@ -341,7 +366,6 @@ namespace Postler {
string[] pieces = msg.split ( );
total = total - pieces[1].to_double ();
if (helper.folder == INBOX) {
-unread += pieces[3].to_int ();
helper.folder = _(Inbox);
}
}
@@ -401,7 +425,6 @@ namespace Postler {
return;
}
-unread = 0;
foreach (var info in infos) {
try {
progress (info.display_name, _(Checking for mail...),
0.0);
@@ -426,12 +449,17 @@ namespace Postler {
received (helper.display_name, error_message);
return;
}
-GLib.debug (Done: %d new messages, unread);
-if (unread 0) {
-Postler.App.send_notification (
-ngettext (You have %d message,
-You have %d new messages, unread).printf
(unread));
-Postler.App.play_sound (message-new-email);
+try {
+if ((unread = unread_messages (%/INBOX/%)) 0) {
+GLib.debug (Done: %d new messages,
(int)unread);
+Postler.App.send_notification (
+ngettext (You have %d message,
+You have %d new messages,
(int)unread).printf ((int)unread));
+Postler.App.play_sound (message-new-email);
+}
+}
+catch (GLib.Error error) {
+GLib.debug (Done: ?? new messages);
}
received (helper.display_name, );
});
@@ -464,7 +492,6 @@ namespace Postler {
if (infos.length () == 0)
return false;
-unread = 0;
foreach (var info in infos) {
try {
string command = accounts.get_fetch_command (info);
@@ -552,8 +579,10 @@ namespace Postler {
void name_aquired (DBusConnection conn) {
try {
-conn.register_object (/org/elementary/postler,
- new PostlerService ());
+var service = new PostlerService ();
+conn.register_object (/org/elementary/postler, service);
+conn.register_object (/com/canonical/unity/launcherentry,
+ new LauncherEntry (service));
} catch (IOError e) {
stderr.printf (Could not register service\n);
}
[Xfce4-commits] postler:master Guess sender names based on other messages sent
Updating branch refs/heads/master
to ef85546fc0daf33d7acc6acbdcedb0367ebdf2c4 (commit)
from 18fed6282bf95a83a03c2d331b58074e23aa99ee (commit)
commit ef85546fc0daf33d7acc6acbdcedb0367ebdf2c4
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Jun 3 23:25:48 2011 +0200
Guess sender names based on other messages sent
postler/postler-index.vala | 24
postler/postler-message.vala |2 +-
2 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index 1c5d62c..5f04dc6 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -18,6 +18,7 @@ namespace Postler {
static Sqlite.Statement? statement_count = null;
static Sqlite.Statement? statement_remove = null;
static Sqlite.Statement? statement_unread = null;
+static Sqlite.Statement? statement_guess = null;
static int64 startup_timestamp = new DateTime.now_utc ().to_unix ();
bool row_or_done (int result) {
@@ -182,6 +183,7 @@ namespace Postler {
throw new GLib.FileError.FAILED (_(Failed to get message:
%s), database.errmsg ());
}
var message = new Message.from_statement (id, statement_get);
+message.sender = guess_name (message.sender);
statement_get.reset ();
return message;
}
@@ -210,6 +212,28 @@ namespace Postler {
statement_list.reset ();
return ids;
}
+
+public string guess_name (string address) throws GLib.Error {
+if (statement_guess == null) {
+if (database.prepare_v2 (
+SELECT sender FROM messages WHERE sender LIKE ?1
+GROUP BY sender ORDER BY COUNT (sender) DESC LIMIT 1
+,
+-1, out statement_guess) != Sqlite.OK)
+throw new GLib.FileError.FAILED (_(Failed to list
messages: %s), database.errmsg ());
+}
+bool success =
+statement_guess.bind_text (1, % + address + , -1) ==
Sqlite.OK;
+int result = statement_guess.step ();
+success = success row_or_done (result);
+if (!success) {
+statement_guess.reset ();
+throw new GLib.FileError.FAILED (_(Failed to guess name:
%s), database.errmsg ());
+}
+string find = result == Sqlite.ROW ? statement_guess.column_text
(0) : address;
+statement_guess.reset ();
+return find;
+}
}
}
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index 925ef99..2d1c593 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -29,7 +29,7 @@ namespace Postler {
public GLib.DateTime? date { public get; set; }
public int64 get_timestamp () { return date != null ? date.to_unix ()
: 0; }
public string? subject { public get; set; }
-public string? sender { public get; set; }
+public string? sender { public get; internal set; }
public string? recipients { public get; set; }
public string? reply_to { public get; set; }
public bool unread { public get; set; }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Render indicators with unread_messages and unread
Updating branch refs/heads/master
to b03910de19acbd3a339609b7dbcb6302126e8d0f (commit)
from 154243402d30f13eabee3176f32667c82a100f80 (commit)
commit b03910de19acbd3a339609b7dbcb6302126e8d0f
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Jun 3 23:01:55 2011 +0200
Render indicators with unread_messages and unread
Also stop drawing attention.
postler/postler-service.vala | 21 +
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index 8a906f2..6d94082 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -136,18 +136,17 @@ namespace Postler {
ListIndicate.Indicator items;
void update_inbox_indicator (Indicate.Indicator item) {
-string path = item.get_property (url) + /INBOX/new;
+string path = file:// + item.get_property (url) + /INBOX/%;
uint new_messages = 0;
+
+notify[unread].connect ((object, pspec) = {
+update_inbox_indicator (item);
+});
+
try {
-new_messages = (uint)unread_messages (file:// + path);
-var folder = File.new_for_path (path);
-var monitor = folder.monitor_directory (0, null);
-monitor.changed.connect ((monitor, file, other, event) = {
-update_inbox_indicator (item);
-});
-indicator.set_data (monitor, monitor);
-
-} catch (Error error) {
+new_messages = (uint)unread_messages (path);
+}
+catch (Error error) {
GLib.warning (Indicator: %s, error.message);
}
@@ -166,7 +165,6 @@ namespace Postler {
var item = new Indicate.Indicator.with_server (indicator);
item.set_property (name, info.display_name);
item.set_property (url, info.path);
-item.set_property (draw-attention, true);
item.user_display.connect ((item) = {
string url = item.get_property (url);
Postler.App.spawn_module (bureau, url + /INBOX);
@@ -191,7 +189,6 @@ namespace Postler {
}
bool badge_timer () {
-var accounts = new Accounts ();
uint new_messages = 0;
try {
new_messages = (uint)unread_messages (%/INBOX/%);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Use client API instead of monitors for folder list
Updating branch refs/heads/master
to 18fed6282bf95a83a03c2d331b58074e23aa99ee (commit)
from b03910de19acbd3a339609b7dbcb6302126e8d0f (commit)
commit 18fed6282bf95a83a03c2d331b58074e23aa99ee
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Jun 3 23:11:28 2011 +0200
Use client API instead of monitors for folder list
postler/postler-folders.vala | 88 +
1 files changed, 20 insertions(+), 68 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index c737e85..09077cc 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -16,6 +16,7 @@ public class Postler.Folders : Gtk.TreeView {
Gtk.TreePath? selected_folder = null;
Gtk.TreePath? drop_folder = null;
int blink_counter = -1;
+Postler.Client client = new Client ();
public Postler.Messages messages { get; set; }
public string? selected_location { get; private set; }
@@ -39,8 +40,6 @@ public class Postler.Folders : Gtk.TreeView {
LOCATION,
INFO,
TOPLEVEL_MONITOR,
-FOLDER_MONITOR,
-UNREAD_MONITOR,
FOLDER_TYPE
}
@@ -163,11 +162,10 @@ public class Postler.Folders : Gtk.TreeView {
}
}
-store = new Gtk.TreeStore (10,
+store = new Gtk.TreeStore (8,
typeof (string), typeof (string), typeof (string),
typeof (int), typeof (string),
-typeof (AccountInfo), typeof (GLib.FileMonitor),
-typeof (GLib.FileMonitor), typeof (GLib.FileMonitor), typeof
(FolderType));
+typeof (AccountInfo), typeof (GLib.FileMonitor), typeof
(FolderType));
set_model (store);
/* Column #0 is for padding only, that's why the expander is in #1 */
insert_column_with_data_func (-1, , new Gtk.CellRendererPixbuf (),
@@ -210,14 +208,13 @@ public class Postler.Folders : Gtk.TreeView {
assert_not_reached ();
}
-async void unread_count_update (Gtk.TreeIter iter, File msg_dir, string
label) {
+async void unread_count_update (Gtk.TreeIter iter, string folder, string
label) {
try {
-var client = new Client ();
-int64 unread = yield client.unread_messages (msg_dir.get_uri () +
%);
+int64 unread = yield client.unread_messages (%/ + folder + /%);
string escaped = GLib.Markup.escape_text (label);
if (unread == 0)
store.set (iter, Columns.DISPLAY_NAME, %s.printf (escaped));
-else if (msg_dir.get_path ().has_suffix (INBOX/new))
+else if (INBOX in folder)
store.set (iter, Columns.DISPLAY_NAME,
b%s (%d)/b.printf (escaped, (int)unread));
else
@@ -225,34 +222,10 @@ public class Postler.Folders : Gtk.TreeView {
%s (%d).printf (escaped, (int)unread));
} catch (GLib.Error error) {
GLib.critical (_(Failed to monitor folder \%s\: %s),
- msg_dir.get_path (), error.message);
+ folder, error.message);
}
}
-void unread_monitor_changed (File msg_dir, string label) {
-string location = msg_dir.get_path ();
-location = location.slice (0, -4); /* - /new */
-
-Gtk.TreeIter account_iter;
-if (!store.iter_children (out account_iter, null))
-return;
-do {
-string existing_location;
-store.get (account_iter, Columns.LOCATION, out existing_location);
-if (existing_location == location) {
-unread_count_update (account_iter, msg_dir, label);
-break;
-}
-string account_location = existing_location.slice (0, - 6);
-if (location.has_prefix (account_location)) {
-Gtk.TreeIter iter;
-if (get_folder_iter (location, account_iter, out iter))
-unread_count_update (iter, msg_dir, label);
-break;
-}
-} while (store.iter_next (ref account_iter));
-}
-
public bool populate () {
store.clear ();
@@ -416,22 +389,21 @@ public class Postler.Folders : Gtk.TreeView {
continue;
if (name == INBOX) {
-var msg_dir = folder_dir.resolve_relative_path (
-account_info.path + / + name + /new);
-monitor = msg_dir.monitor_directory (0, null);
string label = account_info.display_name;
-monitor.changed.connect ((monitor, file, other, event)
= {
-unread_monitor_changed (msg_dir, label);
+/* FIXME: The client emits, the callback isn't called
*/
+client.received.connect ((account, error_message) = {
+
[Xfce4-commits] postler:master Implement message moving in Message.move()
Updating branch refs/heads/master
to 70385220636313718daf91edf852daddb8f1ac26 (commit)
from ef85546fc0daf33d7acc6acbdcedb0367ebdf2c4 (commit)
commit 70385220636313718daf91edf852daddb8f1ac26
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jun 4 14:27:00 2011 +0200
Implement message moving in Message.move()
postler/postler-message.vala | 13 +
postler/postler-messages.vala | 12 ++--
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index 2d1c593..e2e9aab 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -135,6 +135,19 @@ namespace Postler {
}
}
+public void move (string? destination) throws GLib.Error {
+var file = File.new_for_uri (uri);
+if (destination == null) {
+file.delete ();
+return;
+}
+
+string new_location = Postler.Messages.update_filename (
+file.get_path (), destination + /cur/);
+var destination_file = File.new_for_path (new_location);
+file.move (destination_file, GLib.FileCopyFlags.NONE);
+}
+
public Message.from_file (GLib.File file,
GLib.Cancellable? cancellable = null) throws GLib.Error {
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 7039422..aee94e1 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -755,14 +755,10 @@ public class Postler.Messages : Gtk.TreeView {
if (model.get_iter (out iter, path)) {
Message message;
model.get (iter, Columns.MESSAGE, out message);
-var file = File.new_for_path (message.get_path ());
try {
-if (destination_path == null)
-file.delete (null);
-else {
if (account_info.type == AccountType.SEARCH) {
/* Look for the account belonging to the message */
-string location = file.get_path ();
+string location = message.get_path ();
string inbox_folder = location.substring (0,
location.pointer_to_offset (location.rstr
(/)));
return_if_fail (inbox_folder.has_suffix
(/INBOX/new)
@@ -780,11 +776,7 @@ public class Postler.Messages : Gtk.TreeView {
return_if_fail (destination_path != null);
}
-string new_location = update_filename (location,
-destination_path + /cur/);
-var destination_file = File.new_for_path
(new_location);
-file.move (destination_file, GLib.FileCopyFlags.NONE);
-}
+message.move (destination_path);
/* Move to next, more recent message row */
Gtk.TreePath next_path = model.get_path (iter);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to f5c6a56a4d2a31288e32fc9c069a2c2d9a0253f3 (commit) from 70385220636313718daf91edf852daddb8f1ac26 (commit) commit f5c6a56a4d2a31288e32fc9c069a2c2d9a0253f3 Author: Sérgio Cipolla secipo...@gmail.com Date: Sat Jun 4 16:58:08 2011 +0200 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 278 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 304 ++- 1 files changed, 174 insertions(+), 130 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index be2dae9..a8025e1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Sérgio Cipolla secipo...@gmail.com, 2011. -# +# msgid msgstr Project-Id-Version: postler 0.1.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-05-21 22:19+\n -PO-Revision-Date: 2011-04-26 08:59-0300\n +POT-Creation-Date: 2011-06-04 11:40-0300\n +PO-Revision-Date: 2011-06-04 11:55-0300\n Last-Translator: Sérgio Cipolla secipo...@gmail.com\n Language-Team: pt_BR\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n Plural-Forms: nplurals=2; plural=n != 1;\n #: ../data/postler.desktop.in.h:1 @@ -25,13 +25,16 @@ msgstr Interface simples para correio eletrônico msgid Mail reader msgstr Leitor de email -#: ../data/postler.desktop.in.h:3 ../postler/postler-reader.vala:42 -#: ../postler/postler-service.vala:178 +#: ../data/postler.desktop.in.h:3 +#: ../postler/postler-reader.vala:42 +#: ../postler/postler-service.vala:302 msgid Postler msgstr Postler -#: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:202 -#: ../postler/postler-folders.vala:496 ../postler/postler-service.vala:244 +#: ../postler/postler-accounts.vala:70 +#: ../postler/postler-accounts.vala:202 +#: ../postler/postler-folders.vala:465 +#: ../postler/postler-service.vala:366 msgid Inbox msgstr Caixa de entrada @@ -100,7 +103,8 @@ msgstr Nenhum certificado SSL disponível msgid Invalid address msgstr Endereço inválido -#: ../postler/postler-accounts.vala:492 ../postler/postler-accounts.vala:494 +#: ../postler/postler-accounts.vala:492 +#: ../postler/postler-accounts.vala:494 msgid Hostname is missing msgstr Falta o nome do servidor @@ -112,13 +116,15 @@ msgstr Falta o nome de usuário msgid Password is missing msgstr Falta a senha -#: ../postler/postler-accounts.vala:602 ../postler/postler-accounts.vala:620 +#: ../postler/postler-accounts.vala:602 +#: ../postler/postler-accounts.vala:620 #: ../postler/postler-accounts.vala:640 #, c-format msgid Account \%s\ can't receive mail. msgstr A conta \%s\ não pode receber mensagens. -#: ../postler/postler-accounts.vala:623 ../postler/postler-accounts.vala:643 +#: ../postler/postler-accounts.vala:623 +#: ../postler/postler-accounts.vala:643 msgid Mail folder couldn't be created. msgstr A pasta de mensagens não pôde ser criada. @@ -338,7 +344,8 @@ msgstr Abrir msgid Failed to send notification: %s msgstr Falha ao enviar a notificação: %s -#: ../postler/postler-bureau.vala:156 ../postler/postler-bureau.vala:165 +#: ../postler/postler-bureau.vala:156 +#: ../postler/postler-bureau.vala:165 msgid This message was sent to a mailing list. msgstr Esta mensagem foi enviada para uma lista de discussão. @@ -346,7 +353,8 @@ msgstr Esta mensagem foi enviada para uma lista de discussão. msgid Replying is not allowed. msgstr Responder não é permitido. -#: ../postler/postler-bureau.vala:158 ../postler/postler-bureau.vala:167 +#: ../postler/postler-bureau.vala:158 +#: ../postler/postler-bureau.vala:167 msgid Reply to _Sender msgstr Respon_der ao remetente @@ -362,7 +370,8 @@ msgstr Responder à _lista msgid translator-credits msgstr Sérgio Cipolla secipo...@gmail.com -#: ../postler/postler-bureau.vala:439 ../postler/postler-composer.vala:487 +#: ../postler/postler-bureau.vala:439 +#: ../postler/postler-composer.vala:487 msgid _Mail msgstr _Correio @@ -394,11 +403,13 @@ msgstr Marcar a mensagem como não lida msgid Flag message msgstr Assinalar mensagem -#: ../postler/postler-bureau.vala:455 ../postler/postler-bureau.vala:768 +#: ../postler/postler-bureau.vala:455 +#: ../postler/postler-bureau.vala:768 msgid Archive message msgstr Arquivar mensagem -#: ../postler/postler-bureau.vala:457 ../postler/postler-bureau.vala:760 +#: ../postler/postler-bureau.vala:457 +#: ../postler/postler-bureau.vala:760 msgid Mark message as junk msgstr Marcar a mensagem como entulho @@ -426,7 +437,8 @@ msgstr Ir para a mensagem não lida seguinte msgid Quit the application msgstr Sair do aplicativo -#: ../postler/postler-bureau.vala:466 ../postler/postler-composer.vala:496 +#:
[Xfce4-commits] postler:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to be932ae48303f384c46bfb45e7572ae4526b24b8 (commit) from f5c6a56a4d2a31288e32fc9c069a2c2d9a0253f3 (commit) commit be932ae48303f384c46bfb45e7572ae4526b24b8 Author: Sérgio Cipolla secipo...@gmail.com Date: Sat Jun 4 18:09:28 2011 +0200 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 278 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 30 +++--- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a8025e1..39d9b1b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: postler 0.1.1\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2011-06-04 11:40-0300\n -PO-Revision-Date: 2011-06-04 11:55-0300\n +PO-Revision-Date: 2011-06-04 13:08-0300\n Last-Translator: Sérgio Cipolla secipo...@gmail.com\n Language-Team: pt_BR\n Language: \n @@ -393,7 +393,7 @@ msgstr Responder a todos os destinatários #: ../postler/postler-bureau.vala:449 msgid Forward message -msgstr Encaminhar mensagem +msgstr Encaminhar a mensagem #: ../postler/postler-bureau.vala:451 msgid Mark message as unread @@ -401,12 +401,12 @@ msgstr Marcar a mensagem como não lida #: ../postler/postler-bureau.vala:453 msgid Flag message -msgstr Assinalar mensagem +msgstr Assinalar a mensagem #: ../postler/postler-bureau.vala:455 #: ../postler/postler-bureau.vala:768 msgid Archive message -msgstr Arquivar mensagem +msgstr Arquivar a mensagem #: ../postler/postler-bureau.vala:457 #: ../postler/postler-bureau.vala:760 @@ -415,7 +415,7 @@ msgstr Marcar a mensagem como entulho #: ../postler/postler-bureau.vala:459 msgid Delete message -msgstr Apagar mensagem +msgstr Apagar a mensagem #: ../postler/postler-bureau.vala:460 msgid _Previous Unread Message @@ -487,7 +487,7 @@ msgstr Restaurar o tamanho do texto ao padrão #: ../postler/postler-bureau.vala:481 msgid View the message in fullscreen -msgstr Ver mensagem em tela cheia +msgstr Ver a mensagem em tela cheia #: ../postler/postler-bureau.vala:482 #: ../postler/postler-content.vala:316 @@ -565,7 +565,7 @@ msgstr _Corpo #: ../postler/postler-bureau.vala:510 msgid Search the full message text -msgstr Pesquisar texto integral da mensagem +msgstr Pesquisar no texto integral da mensagem #: ../postler/postler-bureau.vala:532 msgid _Restore selected messages @@ -631,11 +631,11 @@ msgstr %s - Postler #: ../postler/postler-bureau.vala:757 msgid Mark message as not junk -msgstr Marcar mensagem como não sendo entulho +msgstr Marcar a mensagem como não sendo entulho #: ../postler/postler-bureau.vala:765 msgid Move message back to Inbox -msgstr Mover mensagem de volta à caixa de entrada +msgstr Mover a mensagem de volta à caixa de entrada #: ../postler/postler-bureau.vala:859 #, c-format @@ -661,7 +661,7 @@ msgstr Você não informou um assunto. #: ../postler/postler-composer.vala:135 msgid Do you want to send the message without a subject? -msgstr Pretende enviar a mensagem sem um assunto? +msgstr Quer enviar a mensagem sem um assunto? #: ../postler/postler-composer.vala:137 msgid _Send message without subject @@ -732,7 +732,7 @@ msgstr Enviar a mensagem #: ../postler/postler-composer.vala:491 msgid Save message as draft -msgstr Salvar mensagem como rascunho +msgstr Salvar a mensagem como rascunho #: ../postler/postler-composer.vala:492 msgid _Attach File @@ -788,11 +788,11 @@ msgstr Inserir uma face triste #: ../postler/postler-composer.vala:512 msgid Mark message as important -msgstr Marcar mensagem como importante +msgstr Marcar a mensagem como importante #: ../postler/postler-composer.vala:517 msgid Compose message -msgstr Escrever mensagem +msgstr Escrever uma mensagem #: ../postler/postler-composer.vala:594 msgid Insert Smiley @@ -1174,7 +1174,7 @@ msgstr Falha ao expurgar nomes de arquivos antigos: %s #: ../postler/postler-service.vala:314 msgid Compose Message -msgstr Escrever mensagem +msgstr Escrever uma mensagem #: ../postler/postler-service.vala:323 msgid Contacts @@ -1197,7 +1197,7 @@ msgstr Verificando correio... #, c-format msgid You have %d message msgid_plural You have %d new messages -msgstr[0] Você tem %d mensagem +msgstr[0] Você tem %d nova mensagem msgstr[1] Você tem %d novas mensagens #: ../postler/postler-service.vala:504 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Add better makefile.
Updating branch refs/heads/master to e767224f8c47a03a3aba8b5a937c8f24876b2a6d (commit) from 1836d4aac09c5b8afae2b788d88da38011d48cae (commit) commit e767224f8c47a03a3aba8b5a937c8f24876b2a6d Author: Nick Schermer n...@xfce.org Date: Sat Jun 4 17:19:51 2011 +0200 Add better makefile. .../merge-with-xfrun/demo-code/c/Makefile | 23 ++- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/Makefile b/xfce4-appfinder/merge-with-xfrun/demo-code/c/Makefile index 0d46187..fe3261a 100644 --- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/Makefile +++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/Makefile @@ -1,12 +1,13 @@ -all: - gcc -Wall -Werror -O2 -pipe \ - `pkg-config --libs --cflags gtk+-2.0` \ - `pkg-config --libs --cflags libxfce4util-1.0` \ - `pkg-config --libs --cflags garcon-1` \ - `pkg-config --libs --cflags gthread-2.0` \ - `pkg-config --libs --cflags libxfce4ui-1` \ - main.c appfinder-window.c appfinder-window.h \ - appfinder-model.c appfinder-model.h \ - appfinder-category-model.c appfinder-category-model.h \ - -o appfinder +CFLAGS= -Wall -Werror -O2 -pipe `pkg-config --libs --cflags gtk+-2.0 libxfce4util-1.0 garcon-1 gthread-2.0 libxfce4ui-1` +DEPS = appfinder-window.h appfinder-model.h appfinder-category-model.h +OBJ = appfinder-window.o appfinder-model.o appfinder-category-model.o main.o + +%.o: %.c $(DEPS) + gcc -c -o $@ $ $(CFLAGS) + +appfinder: $(OBJ) + gcc -o $@ $^ $(CFLAGS) + +clean: + rm *.o appfinder ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Add history loading.
Updating branch refs/heads/master
to f022175679338adec51c4ad4bbeedc303cae5c6a (commit)
from e767224f8c47a03a3aba8b5a937c8f24876b2a6d (commit)
commit f022175679338adec51c4ad4bbeedc303cae5c6a
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 18:19:51 2011 +0200
Add history loading.
.../merge-with-xfrun/demo-code/c/appfinder-model.c | 175
.../demo-code/c/appfinder-window.c |2 +
2 files changed, 146 insertions(+), 31 deletions(-)
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
index a8c61d5..7883df7 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
@@ -61,6 +61,8 @@ struct _XfceAppfinderModel
GSList*items;
GarconMenu*menu;
+ GdkPixbuf *command_icon;
+
gchar *filter_category;
gchar *filter_string;
guint filter_idle_id;
@@ -79,6 +81,7 @@ typedef struct
gchar *key;
gchar *abstract;
gchar *category;
+ gchar *command;
guint visible : 1;
}
ModelItem;
@@ -125,6 +128,7 @@ xfce_appfinder_model_init (XfceAppfinderModel *model)
{
/* generate a unique stamp */
model-stamp = g_random_int ();
+ model-command_icon = xfce_appfinder_model_load_pixbuf (GTK_STOCK_EXECUTE,
32);
model-menu = garcon_menu_new_applications ();
model-collect_thread = g_thread_create
(xfce_appfinder_model_collect_thread, model, TRUE, NULL);
@@ -177,6 +181,9 @@ xfce_appfinder_model_finalize (GObject *object)
g_free (model-filter_category);
g_free (model-filter_string);
+ if (model-command_icon != NULL)
+g_object_unref (G_OBJECT (model-command_icon));
+
g_message (model cleared);
(*G_OBJECT_CLASS (xfce_appfinder_model_parent_class)-finalize) (object);
@@ -277,7 +284,8 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
g_return_if_fail (iter-stamp == model-stamp);
item = ITER_GET_DATA (iter);
- g_return_if_fail (GARCON_IS_MENU_ITEM (item-item));
+ g_return_if_fail ((item-item == NULL item-command != NULL)
+|| (item-item != NULL GARCON_IS_MENU_ITEM
(item-item)));
switch (column)
{
@@ -287,16 +295,22 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
break;
case XFCE_APPFINDER_MODEL_COLUMN_ABSTRACT:
- if (item-abstract == NULL
- item-item != NULL)
+ if (item-abstract == NULL)
{
- name = garcon_menu_item_get_name (item-item);
- comment = garcon_menu_item_get_comment (item-item);
+ if (item-item != NULL)
+{
+ name = garcon_menu_item_get_name (item-item);
+ comment = garcon_menu_item_get_comment (item-item);
- if (comment != NULL)
-item-abstract = g_markup_printf_escaped (b%s/b\n%s, name,
comment);
- else
-item-abstract = g_markup_printf_escaped (b%s/b, name);
+ if (comment != NULL)
+item-abstract = g_markup_printf_escaped (b%s/b\n%s,
name, comment);
+ else
+item-abstract = g_markup_printf_escaped (b%s/b, name);
+}
+ else if (item-command != NULL)
+{
+ item-abstract = g_markup_escape_text (item-command, -1);
+}
}
g_value_init (value, G_TYPE_STRING);
@@ -304,22 +318,37 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
break;
case XFCE_APPFINDER_MODEL_COLUMN_ICON:
- if (item-pixbuf == NULL
- item-item != NULL)
-item-pixbuf = xfce_appfinder_model_load_pixbuf
(garcon_menu_item_get_icon_name (item-item), 32);
+ if (item-pixbuf == NULL)
+{
+ if (item-item != NULL)
+{
+ name = garcon_menu_item_get_icon_name (item-item);
+ item-pixbuf = xfce_appfinder_model_load_pixbuf (name, 32);
+}
+ else if (item-command != NULL)
+{
+ item-pixbuf = g_object_ref (G_OBJECT (model-command_icon));
+}
+}
g_value_init (value, GDK_TYPE_PIXBUF);
g_value_set_object (value, item-pixbuf);
break;
case XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE:
+ if (item-item != NULL)
+name = garcon_menu_item_get_icon_name (item-item);
+ else
+name = GTK_STOCK_EXECUTE;
+
g_value_init (value, GDK_TYPE_PIXBUF);
- g_value_take_object (value, xfce_appfinder_model_load_pixbuf
(garcon_menu_item_get_icon_name (item-item), 48));
+ g_value_take_object (value, xfce_appfinder_model_load_pixbuf (name, 48));
break;
case XFCE_APPFINDER_MODEL_COLUMN_URI:
g_value_init (value, G_TYPE_STRING);
- g_value_take_string (value, garcon_menu_item_get_uri (item-item));
+ if
[Xfce4-commits] design:master Add entry completion.
Updating branch refs/heads/master
to 29617ffd374b19089bf74bf6fdb735ceb185d45e (commit)
from f022175679338adec51c4ad4bbeedc303cae5c6a (commit)
commit 29617ffd374b19089bf74bf6fdb735ceb185d45e
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 18:36:21 2011 +0200
Add entry completion.
.../merge-with-xfrun/demo-code/c/appfinder-model.c | 27 +++-
.../merge-with-xfrun/demo-code/c/appfinder-model.h |1 +
.../demo-code/c/appfinder-window.c | 10 +++
3 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
index 7883df7..b04acc2 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
@@ -215,6 +215,7 @@ xfce_appfinder_model_get_column_type (GtkTreeModel
*tree_model,
{
case XFCE_APPFINDER_MODEL_COLUMN_ABSTRACT:
case XFCE_APPFINDER_MODEL_COLUMN_URI:
+case XFCE_APPFINDER_MODEL_COLUMN_COMMAND:
return G_TYPE_STRING;
case XFCE_APPFINDER_MODEL_COLUMN_ICON:
@@ -278,7 +279,9 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
{
XfceAppfinderModel *model = XFCE_APPFINDER_MODEL (tree_model);
ModelItem *item;
- const gchar*name, *comment;
+ const gchar*name;
+ const gchar*comment;
+ const gchar*command, *p;
g_return_if_fail (XFCE_IS_APPFINDER_MODEL (model));
g_return_if_fail (iter-stamp == model-stamp);
@@ -317,6 +320,27 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
g_value_set_static_string (value, item-abstract);
break;
+case XFCE_APPFINDER_MODEL_COLUMN_COMMAND:
+ if (item-command == NULL
+ item-item != NULL)
+{
+ command = garcon_menu_item_get_command (item-item);
+ if (command != NULL)
+{
+ /* only add first part of the command */
+ p = strchr (command, ' ');
+ if (p != NULL)
+item-command = g_strndup (command, p - command);
+ else
+item-command = g_strdup (command);
+}
+}
+
+ g_value_init (value, G_TYPE_STRING);
+ g_value_set_static_string (value, item-command);
+ break;
+
+
case XFCE_APPFINDER_MODEL_COLUMN_ICON:
if (item-pixbuf == NULL)
{
@@ -841,6 +865,7 @@ xfce_appfinder_model_filter_idle_destroyed (gpointer data)
}
+
static void
xfce_appfinder_model_filter (XfceAppfinderModel *model)
{
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.h
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.h
index 6ee91d6..bca36d9 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.h
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.h
@@ -28,6 +28,7 @@ enum
XFCE_APPFINDER_MODEL_COLUMN_ICON,
XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE,
XFCE_APPFINDER_MODEL_COLUMN_VISIBLE,
+ XFCE_APPFINDER_MODEL_COLUMN_COMMAND,
XFCE_APPFINDER_MODEL_COLUMN_URI,
XFCE_APPFINDER_MODEL_N_COLUMNS,
};
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
index 5a6dcf2..0a51a4b 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
@@ -119,6 +119,7 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
GtkWidget *bbox;
GtkWidget *button;
GtkTreePath*path;
+ GtkEntryCompletion *completion;
window-last_window_height = 400;
@@ -167,6 +168,15 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (window-entry),
GTK_ENTRY_ICON_SECONDARY, _(Toggle view mode));
gtk_widget_show (entry);
+ completion = gtk_entry_completion_new ();
+ gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (window-model));
+ gtk_entry_completion_set_text_column (completion,
XFCE_APPFINDER_MODEL_COLUMN_COMMAND);
+ gtk_entry_completion_set_popup_completion (completion, TRUE);
+ gtk_entry_completion_set_popup_single_match (completion, FALSE);
+ gtk_entry_completion_set_inline_completion (completion, TRUE);
+ gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+ g_object_unref (G_OBJECT (completion));
+
window-bin_collapsed = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (vbox2), window-bin_collapsed, FALSE, TRUE, 0);
gtk_widget_show (window-bin_collapsed);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Disable the cancel icon; start working on DND.
Updating branch refs/heads/master
to 3763909decd1065b9fe5211a3c92198526df72f2 (commit)
from 29617ffd374b19089bf74bf6fdb735ceb185d45e (commit)
commit 3763909decd1065b9fe5211a3c92198526df72f2
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Jun 4 18:41:41 2011 +0200
Disable the cancel icon; start working on DND.
.../shortcuts-pane/demo-code/custom-view/Makefile |5 -
.../demo-code/custom-view/mockup.vala | 14 +-
.../demo-code/custom-view/shortcut-row.vala| 18 +-
3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/Makefile
b/thunar/shortcuts-pane/demo-code/custom-view/Makefile
index f5640cb..62aab09 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/Makefile
+++ b/thunar/shortcuts-pane/demo-code/custom-view/Makefile
@@ -1,7 +1,10 @@
VALA_FLAGS =
VALA_FLAGS += --pkg gtk+-2.0
-VALA_FILES = mockup.vala shortcuts-view.vala shortcut-row.vala
+VALA_FILES = mockup.vala \
+ shortcuts-view.vala \
+ shortcut-row.vala \
+ drag-source.vala
default:
valac $(VALA_FLAGS) $(VALA_FILES) ./mockup
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
b/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
index 5a44325..77a7484 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
@@ -37,10 +37,14 @@ int main (string[] args) {
window.add (frame);
frame.show ();
+ var box = new VBox (false, 6);
+ frame.add (box);
+ box.show ();
+
var scrollwin = new ScrolledWindow (null, null);
scrollwin.set_shadow_type (ShadowType.ETCHED_IN);
scrollwin.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
- frame.add (scrollwin);
+ box.add (scrollwin);
scrollwin.show ();
var viewport = new Viewport (null, null);
@@ -51,6 +55,14 @@ int main (string[] args) {
viewport.add (view);
view.show ();
+ var local_file = new DragSource (file:///home/jannis/foo.txt);
+ box.pack_start (local_file, false, true, 0);
+ local_file.show ();
+
+ var remote_uri = new DragSource (sftp://xfce.org/home/jannis/bar.txt;);
+ box.pack_start (remote_uri, false, true, 0);
+ remote_uri.show ();
+
window.show ();
Gtk.main ();
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
b/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
index ff988bd..0ef1b6f 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
@@ -73,11 +73,11 @@ public class ShortcutRow : EventBox {
button.set_no_show_all (true);
box.pack_start (button, false, true, 0);
-button.enter.connect (() = {
- if (spinner.active) {
-button.set_image (cancel_icon);
- }
-});
+//button.enter.connect (() = {
+// if (spinner.active) {
+//button.set_image (cancel_icon);
+// }
+//});
button.leave.connect (() = {
if (spinner.active) {
@@ -125,11 +125,11 @@ public class ShortcutRow : EventBox {
Gdk.ModifierType state;
get_current_event_state (out state);
-if ((state Gdk.ModifierType.BUTTON1_MASK) != 0) {
- button.set_image (cancel_icon);
-} else {
+//if ((state Gdk.ModifierType.BUTTON1_MASK) != 0) {
+// button.set_image (cancel_icon);
+//} else {
button.set_image (spinner);
-}
+//}
spinner.start ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Add missing drag source widget.
Updating branch refs/heads/master
to efac5ae419cb9e11435c949c0bc2ee33a0fd2a15 (commit)
from 3763909decd1065b9fe5211a3c92198526df72f2 (commit)
commit efac5ae419cb9e11435c949c0bc2ee33a0fd2a15
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Jun 4 18:43:39 2011 +0200
Add missing drag source widget.
.../demo-code/custom-view/drag-source.vala | 37
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
b/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
new file mode 100644
index 000..baaa0cf
--- /dev/null
+++ b/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
@@ -0,0 +1,37 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2011 Jannis Pohlmann jan...@xfce.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+using Gtk;
+
+
+
+class DragSource : EventBox {
+
+ public string location { get; set; }
+
+ public DragSource (string location) {
+this.location = location;
+
+var label = new Label (this.location);
+add (label);
+label.show ();
+ }
+
+}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Disable completion in expanded view.
Updating branch refs/heads/master
to 35a2ac670e98fc991545b857355f68cf5e5c5f20 (commit)
from efac5ae419cb9e11435c949c0bc2ee33a0fd2a15 (commit)
commit 35a2ac670e98fc991545b857355f68cf5e5c5f20
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 18:55:01 2011 +0200
Disable completion in expanded view.
.../demo-code/c/appfinder-window.c | 22 ++-
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
index 0a51a4b..558c748 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
@@ -60,6 +60,8 @@ struct _XfceAppfinderWindow
XfceAppfinderCategoryModel *category_model;
+ GtkEntryCompletion *completion;
+
GtkWidget *paned;
GtkWidget *entry;
GtkWidget *image;
@@ -168,14 +170,12 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (window-entry),
GTK_ENTRY_ICON_SECONDARY, _(Toggle view mode));
gtk_widget_show (entry);
- completion = gtk_entry_completion_new ();
+ window-completion = completion = gtk_entry_completion_new ();
gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (window-model));
gtk_entry_completion_set_text_column (completion,
XFCE_APPFINDER_MODEL_COLUMN_COMMAND);
gtk_entry_completion_set_popup_completion (completion, TRUE);
gtk_entry_completion_set_popup_single_match (completion, FALSE);
gtk_entry_completion_set_inline_completion (completion, TRUE);
- gtk_entry_set_completion (GTK_ENTRY (entry), completion);
- g_object_unref (G_OBJECT (completion));
window-bin_collapsed = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (vbox2), window-bin_collapsed, FALSE, TRUE, 0);
@@ -294,6 +294,7 @@ xfce_appfinder_window_finalize (GObject *object)
g_object_unref (G_OBJECT (window-model));
g_object_unref (G_OBJECT (window-category_model));
+ g_object_unref (G_OBJECT (window-completion));
(*G_OBJECT_CLASS (xfce_appfinder_window_parent_class)-finalize) (object);
}
@@ -624,9 +625,10 @@ void
xfce_appfinder_window_set_expanded (XfceAppfinderWindow *window,
gboolean expanded)
{
- GdkGeometry hints;
- gint width;
- GtkWidget *parent;
+ GdkGeometry hints;
+ gintwidth;
+ GtkWidget *parent;
+ GtkEntryCompletion *completion;
g_message (set expand = %s, expanded ? true : false);
@@ -668,6 +670,14 @@ xfce_appfinder_window_set_expanded (XfceAppfinderWindow
*window,
expanded ? GTK_STOCK_GO_UP :
GTK_STOCK_GO_DOWN);
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (window-entry),
GTK_ENTRY_ICON_PRIMARY, NULL);
+ /* update completion (remove completed text of restart completion) */
+ completion = gtk_entry_get_completion (GTK_ENTRY (window-entry));
+ if (completion != NULL)
+gtk_editable_delete_selection (GTK_EDITABLE (window-entry));
+ gtk_entry_set_completion (GTK_ENTRY (window-entry), expanded ? NULL :
window-completion);
+ if (!expanded)
+gtk_entry_completion_insert_prefix (window-completion);
+
/* update state */
xfce_appfinder_window_entry_changed (window);
xfce_appfinder_window_item_changed (window);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:master l10n: Initial Indonesian translation
Updating branch refs/heads/master to c5c64c6d5a1d6e3df3e51c5cce2d5b0de178eb4a (commit) from fb01f3faa7d62cad6389fecb0608f69b23c36bdc (commit) commit c5c64c6d5a1d6e3df3e51c5cce2d5b0de178eb4a Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Jun 4 20:19:06 2011 +0200 l10n: Initial Indonesian translation New status: 3 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/po/id.po b/po/id.po new file mode 100644 index 000..73b3a48 --- /dev/null +++ b/po/id.po @@ -0,0 +1,29 @@ +# Indonesian translations for xfce4-indicator-plugin package. +# Copyright (C) 2011 THE xfce4-indicator-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-indicator-plugin package. +# Andhika Padmawan andhika.padma...@gmail.com, 2011. +# +msgid +msgstr +Project-Id-Version: xfce4-indicator-plugin\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2011-06-04 16:20+\n +PO-Revision-Date: 2011-06-05 01:17+0700\n +Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n +Language-Team: Indonesian translation-team...@lists.sourceforge.net\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Language: id\n + +#: ../panel-plugin/indicator.c:119 +msgid No Indicators +msgstr Tak Ada Indikator + +#: ../panel-plugin/indicator.desktop.in.in.h:1 +msgid An indicator of something that needs your attention on the desktop +msgstr Sebuah indikator atau sesuatu yang memerlukan perhatian anda di desktop + +#: ../panel-plugin/indicator.desktop.in.in.h:2 +msgid Indicator Plugin +msgstr Plugin Indikator ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-modemlights-plugin:master l10n: Initial Indonesian translation
Updating branch refs/heads/master
to 141dfc535721765060ec6751d3b8be589fc47035 (commit)
from 2375e663dfcc190a4b27b250123e5b18c8a8613b (commit)
commit 141dfc535721765060ec6751d3b8be589fc47035
Author: Andhika Padmawan andhika.padma...@gmail.com
Date: Sat Jun 4 20:33:13 2011 +0200
l10n: Initial Indonesian translation
New status: 16 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{hr.po = id.po} | 58 +++---
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/po/hr.po b/po/id.po
similarity index 59%
copy from po/hr.po
copy to po/id.po
index 035570c..02d78ef 100644
--- a/po/hr.po
+++ b/po/id.po
@@ -1,37 +1,36 @@
-# C roatian translation for xfce4-modemlights-plugin package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Indonesian translations for xfce4-modemlights-plugin package.
+# Copyright (C) 2011 THE xfce4-modemlights-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the
xfce4-modemlights-plugin package.
-# Ivica Kolić ik...@yahoo.com, 2011.
+# Andhika Padmawan andhika.padma...@gmail.com, 2011.
#
msgid
msgstr
Project-Id-Version: xfce4-modemlights-plugin\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2007-11-08 09:45+0100\n
-PO-Revision-Date: 2011-05-21 17:37+0200\n
-Last-Translator: Ivica Kolić ik...@yahoo.com\n
-Language-Team: Croatian ik...@yahoo.com\n
+PO-Revision-Date: 2011-06-05 01:31+0700\n
+Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n
+Language-Team: Indonesian translation-team...@lists.sourceforge.net\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n
-%10=4 (n%10010 || n%100=20) ? 1 : 2);\n
+Language: id\n
#: ../panel-plugin/panel-plugin.c:183 ../panel-plugin/panel-plugin.c:330
msgid No connection
-msgstr Nema spajanja
+msgstr Tak ada koneksi
#: ../panel-plugin/panel-plugin.c:191
msgid Connection Established
-msgstr Veza uspostavljena
+msgstr Koneksi Tersambung
#: ../panel-plugin/panel-plugin.c:200
msgid Dialing
-msgstr Biram
+msgstr Memanggil
#: ../panel-plugin/panel-plugin.c:517
msgid Select lock file
-msgstr
+msgstr Pilih berkas kunci
#: ../panel-plugin/panel-plugin.c:555
msgid
@@ -45,10 +44,18 @@ msgid
device after establishing the connection is the device/interface name
required.
msgstr
+Ini adalah nama divais (nama antarmuka) untuk koneksi yang tersambung,
+misalnya:\n
+ bppp0/b \n
+Untuk menentukan nama divais, anda dapat mengeksekusi perintah berikut
+sebelum dan setelah koneksi tersambung:\n
+ bcat /proc/net/dev/b \n
+Ini akan menampilkan divais/antarmuka di kolom pertama. Divais baru setelah
+koneksi tersambung adalah nama divais/antarmuka yang diperlukan.
#: ../panel-plugin/panel-plugin.c:592
msgid Lockfile:
-msgstr
+msgstr Berkas kunci:
#: ../panel-plugin/panel-plugin.c:604
msgid
@@ -60,40 +67,47 @@ msgid
indicates to the plugin that no connection has been established and that no
dialing is in progress.
msgstr
+Ini adalah nama dari berkas kunci yang dibuat oleh perintah koneksi,
+seperti:\n
+ b/var/lock/LCK..ttyS1/b \n
+Anda dapat secara rutin menemukan nama ini dengan memeriksa isi /var/lock
+sebelum dan setelah koneksi tersambung. Bila berkas tersebut tidak ada
+maka mengindikasikan kepada plugin bahwa tidak ada koneksi tersambung dan
+tidak ada pemanggilan yang berlangsung.
#: ../panel-plugin/panel-plugin.c:641
msgid Select icon
-msgstr Odaberite ikonu
+msgstr Pilih ikon
#: ../panel-plugin/panel-plugin.c:756
msgid _Connection Command:
-msgstr _Naredba spajanja
+msgstr _Perintah Koneksi:
#: ../panel-plugin/panel-plugin.c:764
msgid _Disconnection Command:
-msgstr _Naredba odspajanja
+msgstr Perintah P_utus:
#: ../panel-plugin/panel-plugin.c:772
msgid De_vice:
-msgstr U_ređaj
+msgstr Di_vais:
#: ../panel-plugin/panel-plugin.c:787
msgid Icon (Disconnected):
-msgstr Ikona (odspojeno):
+msgstr Ikon (Terputus):
#: ../panel-plugin/panel-plugin.c:795
msgid Icon (Connecting):
-msgstr Ikona (spajam):
+msgstr Ikon (Menyambung):
#: ../panel-plugin/panel-plugin.c:803
msgid Icon (Connected):
-msgstr Ikona (spojeno):
+msgstr Ikon (Tersambung):
#: ../panel-plugin/panel-plugin.c:813
#: ../panel-plugin/modemlights.desktop.in.in.h:1
msgid Modem Lights
-msgstr Svjetla modema
+msgstr Modem Lights
#: ../panel-plugin/modemlights.desktop.in.in.h:2
msgid Simple PPP connections via modem
-msgstr Jednostavna PPP spajanja putem modema
+msgstr Koneksi PPP sederhana via modem
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-stopwatch-plugin:master l10n: Initial Indonesian translation
Updating branch refs/heads/master to c0b383d8698ed13f86f2a71fa07a5d7a17a1be4a (commit) from 60201ae2d7fec03fd0f861863443d5aa7fa7dab7 (commit) commit c0b383d8698ed13f86f2a71fa07a5d7a17a1be4a Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Jun 4 20:41:25 2011 +0200 l10n: Initial Indonesian translation New status: 2 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 25 + 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/po/id.po b/po/id.po new file mode 100644 index 000..17513cd --- /dev/null +++ b/po/id.po @@ -0,0 +1,25 @@ +# Indonesian translations for xfce4-stopwatch-plugin package. +# Copyright (C) 2011 THE xfce4-stopwatch-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-stopwatch-plugin package. +# Andhika Padmawan andhika.padma...@gmail.com, 2011. +# +msgid +msgstr +Project-Id-Version: xfce4-stopwatch-plugin\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2011-06-04 16:07+\n +PO-Revision-Date: 2011-06-05 01:39+0700\n +Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n +Language-Team: Indonesian translation-team...@lists.sourceforge.net\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Language: id\n + +#: ../panel-plugin/xfce4-stopwatch-plugin.desktop.in.in.h:1 +msgid Stopwatch +msgstr Stopwatch + +#: ../panel-plugin/xfce4-stopwatch-plugin.desktop.in.in.h:2 +msgid Time yourself +msgstr Hitung waktu anda ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-shares-plugin:master l10n: Updated Indonesian (id) translation to 82%
Updating branch refs/heads/master to 56500e82e7972ece8da42f51dbb749ae49aad316 (commit) from c4e3ea0832776cd52115db5ed4cdc5a97ca6e9c3 (commit) commit 56500e82e7972ece8da42f51dbb749ae49aad316 Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Jun 4 20:49:02 2011 +0200 l10n: Updated Indonesian (id) translation to 82% New status: 23 messages complete with 0 fuzzies and 5 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 196 ++ 1 files changed, 108 insertions(+), 88 deletions(-) diff --git a/po/id.po b/po/id.po index 9ec75b3..e12da3b 100644 --- a/po/id.po +++ b/po/id.po @@ -1,174 +1,195 @@ # Indonesian translations for thunar-shares-plugin package. # Copyright (C) 2008 THE thunar-shares-plugin'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Andhika Padmawan andhika.padma...@gmail.com, 2008. +# This file is distributed under the same license as the thunar-shares-plugin package. +# Andhika Padmawan andhika.padma...@gmail.com, 2011. # msgid msgstr Project-Id-Version: thunar-shares-plugin 0.1.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-07-22 20:50-0300\n -PO-Revision-Date: 2009-01-27 22:54+0700\n +POT-Creation-Date: 2011-06-04 16:17+\n +PO-Revision-Date: 2011-06-05 01:47+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian translation-team...@lists.sourceforge.net\n MIME-Version: 1.0\n -Content-Type: text/plain; charset=ASCII\n +Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: ../libshares/libshares-util.c:111 +#: ../libshares/libshares-util.c:161 msgid Please, write a name. msgstr Tolong, tulis nama. -#: ../libshares/libshares-util.c:162 -#: ../data/dialogs.xml.h:1 -#: ../data/thunar-page.xml.h:4 +#. Warn the user +#: ../libshares/libshares-util.c:169 +msgid +Share name too long. Some old clients may have problems to access it, +continue anyway? +msgstr + +#: ../libshares/libshares-util.c:182 +#, c-format +msgid Error while getting share information: %s +msgstr + +#: ../libshares/libshares-util.c:192 +msgid Another share has the same name +msgstr + +#: ../libshares/libshares-util.c:246 msgid Cannot modify the share: msgstr Tak dapat memodifikasi bagian: -#: ../libshares/libshares-util.c:232 +#: ../libshares/libshares-util.c:345 +msgid +Thunar needs to add some permissions to your folder in order to share it. Do +you agree? +msgstr +Thunar perlu menambah beberapa hak akses ke folder anda supaya dapat +membaginya. Anda setuju? + +#: ../libshares/libshares-util.c:384 msgid Error when changing folder permissions. msgstr Galat ketika mengubah hak akses folder. -#: ../libshares/shares.c:146 +#: ../libshares/shares.c:165 #, c-format msgid %s %s %s returned with signal %d msgstr %s %s %s kembali dengan sinyal %d -#: ../libshares/shares.c:155 +#: ../libshares/shares.c:174 #, c-format msgid %s %s %s failed for an unknown reason msgstr %s %s %s gagal karena alasan yang tak diketahui -#: ../libshares/shares.c:175 +#: ../libshares/shares.c:195 #, c-format msgid 'net usershare' returned error %d: %s msgstr 'net usershare' mengembalikan galat %d: %s -#: ../libshares/shares.c:177 +#: ../libshares/shares.c:197 #, c-format msgid 'net usershare' returned error %d msgstr 'net usershare' mengembalikan galat %d -#: ../libshares/shares.c:208 +#: ../libshares/shares.c:231 #, c-format msgid the output of 'net usershare' is not in valid UTF-8 encoding msgstr keluaran 'net usershare' bukan penyandian UTF-8 yang sah -#: ../libshares/shares.c:463 -#: ../libshares/shares.c:636 +#: ../libshares/shares.c:490 ../libshares/shares.c:702 #, c-format msgid Failed msgstr Gagal -#: ../libshares/shares.c:571 +#: ../libshares/shares.c:592 #, c-format msgid Samba's testparm returned with signal %d msgstr Parameter tes Samba kembali dengan sinyal %d -#: ../libshares/shares.c:577 +#: ../libshares/shares.c:598 #, c-format msgid Samba's testparm failed for an unknown reason msgstr Parameter tes Samba gagal karena alasan yang tak diketahui -#: ../libshares/shares.c:592 +#: ../libshares/shares.c:613 #, c-format msgid Samba's testparm returned error %d: %s msgstr Parameter tes Samba mengembalikan galat %d: %s -#: ../libshares/shares.c:594 +#: ../libshares/shares.c:615 #, c-format msgid Samba's testparm returned error %d msgstr Parameter tes Samba mengembalikan galat %d -#: ../libshares/shares.c:701 +#: ../libshares/shares.c:784 #, c-format msgid Cannot remove the share for path %s: that path is not shared -msgstr Tak dapat menghapus bagian untuk alamat %s: alamat tersebut tidak dibagi +msgstr +Tak dapat menghapus bagian untuk alamat %s: alamat tersebut tidak dibagi -#: ../libshares/shares.c:747 +#: ../libshares/shares.c:837 #, c-format -msgid Cannot change the path of an existing share;
[Xfce4-commits] thunar-shares-plugin:master l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/master to 68c1f367eb9d9344e3b2074a5b8642f499cbbea8 (commit) from 56500e82e7972ece8da42f51dbb749ae49aad316 (commit) commit 68c1f367eb9d9344e3b2074a5b8642f499cbbea8 Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Jun 4 20:51:28 2011 +0200 l10n: Updated Indonesian (id) translation to 100% New status: 28 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 40 ++-- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/po/id.po b/po/id.po index e12da3b..6f6bb67 100644 --- a/po/id.po +++ b/po/id.po @@ -2,7 +2,7 @@ # Copyright (C) 2008 THE thunar-shares-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the thunar-shares-plugin package. # Andhika Padmawan andhika.padma...@gmail.com, 2011. -# +# msgid msgstr Project-Id-Version: thunar-shares-plugin 0.1.6\n @@ -21,31 +21,25 @@ msgstr Tolong, tulis nama. #. Warn the user #: ../libshares/libshares-util.c:169 -msgid -Share name too long. Some old clients may have problems to access it, -continue anyway? -msgstr +msgid Share name too long. Some old clients may have problems to access it, continue anyway? +msgstr Nama kongsi terlalu panjang. Beberapa klien lama akan bermasalah ketika mengaksesnya, tetap lanjutkan? #: ../libshares/libshares-util.c:182 #, c-format msgid Error while getting share information: %s -msgstr +msgstr Galat ketika mendapatkan informasi kongsi: %s #: ../libshares/libshares-util.c:192 msgid Another share has the same name -msgstr +msgstr Kongsi lainnya telah mempunyai nama yang sama #: ../libshares/libshares-util.c:246 msgid Cannot modify the share: msgstr Tak dapat memodifikasi bagian: #: ../libshares/libshares-util.c:345 -msgid -Thunar needs to add some permissions to your folder in order to share it. Do -you agree? -msgstr -Thunar perlu menambah beberapa hak akses ke folder anda supaya dapat -membaginya. Anda setuju? +msgid Thunar needs to add some permissions to your folder in order to share it. Do you agree? +msgstr Thunar perlu menambah beberapa hak akses ke folder anda supaya dapat membaginya. Anda setuju? #: ../libshares/libshares-util.c:384 msgid Error when changing folder permissions. @@ -104,17 +98,12 @@ msgstr Parameter tes Samba mengembalikan galat %d #: ../libshares/shares.c:784 #, c-format msgid Cannot remove the share for path %s: that path is not shared -msgstr -Tak dapat menghapus bagian untuk alamat %s: alamat tersebut tidak dibagi +msgstr Tak dapat menghapus bagian untuk alamat %s: alamat tersebut tidak dibagi #: ../libshares/shares.c:837 #, c-format -msgid -Cannot change the path of an existing share; please remove the old share -first and add a new one -msgstr -Tak dapat mengubah alaman bagian yang telah ada; silakan hapus bagian yang -lama terlebih dahulu kemudian tambah yang baru +msgid Cannot change the path of an existing share; please remove the old share first and add a new one +msgstr Tak dapat mengubah alaman bagian yang telah ada; silakan hapus bagian yang lama terlebih dahulu kemudian tambah yang baru #: ../thunar-plugin/tsp-page.c:152 msgid bFolder Sharing/b @@ -149,14 +138,15 @@ msgstr Bagi #: ../thunar-plugin/tsp-page.c:368 msgid You are not the owner of the folder. -msgstr +msgstr Anda bukan pemilik dari folder #: ../thunar-plugin/tsp-page.c:376 msgid -You may need to install Samba, check your user permissions(usershares group) -and re-login.\n +You may need to install Samba, check your user permissions(usershares group) and re-login.\n bMore info:/b uhttp://thunar-shares.googlecode.com//u msgstr +Anda perlu menginstal Samba, cek hak akses pengguna anda (grup usershares) dan masuk kembali.\n +bInfo lebih lanjut:/b uhttp://thunar-shares.googlecode.com//u #~ msgid Thunar - Add a share #~ msgstr Thunar - Tambah bagian @@ -191,10 +181,8 @@ msgstr #~ msgid Thunar Shares Question #~ msgstr Pertanyaan Pembagian Thunar -#, fuzzy #~ msgid Folder: #~ msgstr bFolder:/b -#, fuzzy #~ msgid Share name: #~ msgstr Nama Bagian: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/master to c12f2790826968e56cb70afb4a204262b11e8c8d (commit) from 1ea4d16c6e254a13ede0b2b08aebae3820e02201 (commit) commit c12f2790826968e56cb70afb4a204262b11e8c8d Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sat Jun 4 21:15:56 2011 +0200 l10n: Updated Indonesian (id) translation to 100% New status: 282 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 215 +++-- 1 files changed, 81 insertions(+), 134 deletions(-) diff --git a/po/id.po b/po/id.po index 7d44238..a7d8fef 100644 --- a/po/id.po +++ b/po/id.po @@ -1,20 +1,20 @@ # Indonesian translations for thunar-svn-plugin package. # Copyright (C) 2008 thunar-svn-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the thunar-svn-plugin package. -# Andhika Padmawan andhika.padma...@gmail.com, 2008. +# Andhika Padmawan andhika.padma...@gmail.com, 2011. # msgid msgstr Project-Id-Version: thunar-svn-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-20 12:20+0100\n -PO-Revision-Date: 2009-04-09 21:38-0400\n +POT-Creation-Date: 2011-06-04 16:17+\n +PO-Revision-Date: 2011-06-05 02:14+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian i...@li.org\n -Language: id\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: id\n #: ../thunar-vcs-plugin/tvp-git-action.c:263 #: ../thunar-vcs-plugin/tvp-svn-action.c:300 @@ -30,13 +30,12 @@ msgid Add msgstr Tambah #: ../thunar-vcs-plugin/tvp-git-action.c:264 -#, fuzzy msgid Menu|Bisect -msgstr Salahkan +msgstr Pisah #: ../thunar-vcs-plugin/tvp-git-action.c:264 msgid Bisect -msgstr +msgstr Pisah #: ../thunar-vcs-plugin/tvp-git-action.c:266 #: ../thunar-vcs-plugin/tvp-svn-action.c:305 @@ -51,15 +50,14 @@ msgid Blame msgstr Salahkan #: ../thunar-vcs-plugin/tvp-git-action.c:268 -#, fuzzy msgid Menu|Branch -msgstr Salahkan +msgstr Cabang #: ../thunar-vcs-plugin/tvp-git-action.c:268 ../tvp-git-helper/main.c:161 #: ../tvp-git-helper/tgh-branch-dialog.c:144 #: ../tvp-git-helper/tgh-stash-dialog.c:167 msgid Branch -msgstr +msgstr Cabang #: ../thunar-vcs-plugin/tvp-git-action.c:269 #: ../thunar-vcs-plugin/tvp-svn-action.c:322 @@ -73,25 +71,22 @@ msgid Checkout msgstr Cek keluar #: ../thunar-vcs-plugin/tvp-git-action.c:270 -#, fuzzy msgid Menu|Clean -msgstr Bersihkan +msgstr Hapus #: ../thunar-vcs-plugin/tvp-git-action.c:270 ../tvp-git-helper/main.c:165 #: ../tvp-git-helper/tgh-clean.c:152 ../tvp-git-helper/tgh-clean-dialog.c:96 -#, fuzzy msgid Clean -msgstr Bersihkan +msgstr Hapus #: ../thunar-vcs-plugin/tvp-git-action.c:272 -#, fuzzy msgid Menu|Clone -msgstr Salin +msgstr Klon #: ../thunar-vcs-plugin/tvp-git-action.c:272 ../tvp-git-helper/main.c:169 #: ../tvp-git-helper/tgh-clone.c:115 msgid Clone -msgstr +msgstr Klon #: ../thunar-vcs-plugin/tvp-git-action.c:273 #: ../thunar-vcs-plugin/tvp-svn-action.c:332 @@ -116,32 +111,28 @@ msgid Diff msgstr Beda #: ../thunar-vcs-plugin/tvp-git-action.c:275 -#, fuzzy msgid Menu|Fetch -msgstr Ganti +msgstr Ambil #: ../thunar-vcs-plugin/tvp-git-action.c:275 msgid Fetch -msgstr +msgstr Ambil #: ../thunar-vcs-plugin/tvp-git-action.c:276 -#, fuzzy msgid Menu|Grep -msgstr Bersihkan +msgstr Grep #: ../thunar-vcs-plugin/tvp-git-action.c:276 msgid Grep -msgstr +msgstr Grep #: ../thunar-vcs-plugin/tvp-git-action.c:277 -#, fuzzy msgid Menu|Init -msgstr Info +msgstr Inisialisasi #: ../thunar-vcs-plugin/tvp-git-action.c:277 -#, fuzzy msgid Init -msgstr Ketakterhinggaan +msgstr Inisialisasi #: ../thunar-vcs-plugin/tvp-git-action.c:278 #: ../thunar-vcs-plugin/tvp-svn-action.c:377 @@ -156,14 +147,12 @@ msgid Log msgstr Catatan #: ../thunar-vcs-plugin/tvp-git-action.c:279 -#, fuzzy msgid Menu|Merge -msgstr Pindah +msgstr Gabung #: ../thunar-vcs-plugin/tvp-git-action.c:279 -#, fuzzy msgid Merge -msgstr Dimerger +msgstr Gabung #: ../thunar-vcs-plugin/tvp-git-action.c:281 #: ../thunar-vcs-plugin/tvp-svn-action.c:392 @@ -177,75 +166,64 @@ msgid Move msgstr Pindah #: ../thunar-vcs-plugin/tvp-git-action.c:282 -#, fuzzy msgid Menu|Pull -msgstr Salahkan +msgstr Tarik #: ../thunar-vcs-plugin/tvp-git-action.c:282 msgid Pull -msgstr +msgstr Tarik #: ../thunar-vcs-plugin/tvp-git-action.c:283 -#, fuzzy msgid Menu|Push -msgstr Status +msgstr Dorong #: ../thunar-vcs-plugin/tvp-git-action.c:283 msgid Push -msgstr +msgstr Dorong #: ../thunar-vcs-plugin/tvp-git-action.c:284 -#, fuzzy msgid Menu|Rebase -msgstr Benah +msgstr Integrasi #: ../thunar-vcs-plugin/tvp-git-action.c:284 -#, fuzzy msgid Rebase -msgstr Kembalikan +msgstr Integrasi #: ../thunar-vcs-plugin/tvp-git-action.c:285 -#, fuzzy msgid Menu|Reset -msgstr Kembalikan +msgstr Atur Ulang
[Xfce4-commits] design:master Add more stuff.
Updating branch refs/heads/master
to 9c4ad5588c3f0c0fcd20247a2e1829797a846b0c (commit)
from 35a2ac670e98fc991545b857355f68cf5e5c5f20 (commit)
commit 9c4ad5588c3f0c0fcd20247a2e1829797a846b0c
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 21:41:02 2011 +0200
Add more stuff.
.../merge-with-xfrun/demo-code/c/appfinder-model.c | 157 ++
.../merge-with-xfrun/demo-code/c/appfinder-model.h | 10 +-
.../demo-code/c/appfinder-window.c | 173 ++--
3 files changed, 256 insertions(+), 84 deletions(-)
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
index b04acc2..26979ca 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
@@ -10,6 +10,10 @@
#include appfinder-model.h
+#define HISTORY_PATH xfce4/xfce4-appfinder/history
+#define ICON_SMALL 32
+#define ICON_LARGE 48
+
static void xfce_appfinder_model_tree_model_init
(GtkTreeModelIface*iface);
@@ -61,7 +65,8 @@ struct _XfceAppfinderModel
GSList*items;
GarconMenu*menu;
- GdkPixbuf *command_icon;
+ GdkPixbuf *command_icon_small;
+ GdkPixbuf *command_icon_large;
gchar *filter_category;
gchar *filter_string;
@@ -77,12 +82,14 @@ struct _XfceAppfinderModel
typedef struct
{
GarconMenuItem *item;
- GdkPixbuf *pixbuf;
gchar *key;
gchar *abstract;
gchar *category;
gchar *command;
guint visible : 1;
+
+ GdkPixbuf *icon_small;
+ GdkPixbuf *icon_large;
}
ModelItem;
@@ -128,7 +135,8 @@ xfce_appfinder_model_init (XfceAppfinderModel *model)
{
/* generate a unique stamp */
model-stamp = g_random_int ();
- model-command_icon = xfce_appfinder_model_load_pixbuf (GTK_STOCK_EXECUTE,
32);
+ model-command_icon_small = xfce_appfinder_model_load_pixbuf
(GTK_STOCK_EXECUTE, ICON_SMALL);
+ model-command_icon_large = xfce_appfinder_model_load_pixbuf
(GTK_STOCK_EXECUTE, ICON_LARGE);
model-menu = garcon_menu_new_applications ();
model-collect_thread = g_thread_create
(xfce_appfinder_model_collect_thread, model, TRUE, NULL);
@@ -181,8 +189,8 @@ xfce_appfinder_model_finalize (GObject *object)
g_free (model-filter_category);
g_free (model-filter_string);
- if (model-command_icon != NULL)
-g_object_unref (G_OBJECT (model-command_icon));
+ g_object_unref (G_OBJECT (model-command_icon_large));
+ g_object_unref (G_OBJECT (model-command_icon_small));
g_message (model cleared);
@@ -218,7 +226,7 @@ xfce_appfinder_model_get_column_type (GtkTreeModel
*tree_model,
case XFCE_APPFINDER_MODEL_COLUMN_COMMAND:
return G_TYPE_STRING;
-case XFCE_APPFINDER_MODEL_COLUMN_ICON:
+case XFCE_APPFINDER_MODEL_COLUMN_ICON_SMALL:
case XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE:
return GDK_TYPE_PIXBUF;
@@ -340,33 +348,28 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
g_value_set_static_string (value, item-command);
break;
-
-case XFCE_APPFINDER_MODEL_COLUMN_ICON:
- if (item-pixbuf == NULL)
+case XFCE_APPFINDER_MODEL_COLUMN_ICON_SMALL:
+ if (item-icon_small == NULL
+ item-item != NULL)
{
- if (item-item != NULL)
-{
- name = garcon_menu_item_get_icon_name (item-item);
- item-pixbuf = xfce_appfinder_model_load_pixbuf (name, 32);
-}
- else if (item-command != NULL)
-{
- item-pixbuf = g_object_ref (G_OBJECT (model-command_icon));
-}
+ name = garcon_menu_item_get_icon_name (item-item);
+ item-icon_small = xfce_appfinder_model_load_pixbuf (name,
ICON_SMALL);
}
g_value_init (value, GDK_TYPE_PIXBUF);
- g_value_set_object (value, item-pixbuf);
+ g_value_set_object (value, item-icon_small);
break;
case XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE:
- if (item-item != NULL)
-name = garcon_menu_item_get_icon_name (item-item);
- else
-name = GTK_STOCK_EXECUTE;
+ if (item-icon_large == NULL
+ item-icon_large != NULL)
+{
+ name = garcon_menu_item_get_icon_name (item-item);
+ item-icon_large = xfce_appfinder_model_load_pixbuf (name,
ICON_LARGE);
+}
g_value_init (value, GDK_TYPE_PIXBUF);
- g_value_take_object (value, xfce_appfinder_model_load_pixbuf (name, 48));
+ g_value_set_object (value, item-icon_large);
break;
case XFCE_APPFINDER_MODEL_COLUMN_URI:
@@ -578,8 +581,10 @@ xfce_appfinder_model_item_free (gpointer data)
{
ModelItem *item = data;
- if (item-pixbuf != NULL)
-g_object_unref (G_OBJECT (item-pixbuf));
+ if (item-icon_small != NULL)
+
[Xfce4-commits] design:master Fix icon selection from treeview.
Updating branch refs/heads/master
to 6106a699ed82d7a1c8ab5de5ac1a42e711f3e5e2 (commit)
from 9c4ad5588c3f0c0fcd20247a2e1829797a846b0c (commit)
commit 6106a699ed82d7a1c8ab5de5ac1a42e711f3e5e2
Author: Nick Schermer n...@xfce.org
Date: Sat Jun 4 21:44:29 2011 +0200
Fix icon selection from treeview.
.../merge-with-xfrun/demo-code/c/appfinder-model.c |2 +-
.../demo-code/c/appfinder-window.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
index 26979ca..c0fd921 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-model.c
@@ -362,7 +362,7 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
case XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE:
if (item-icon_large == NULL
- item-icon_large != NULL)
+ item-item != NULL)
{
name = garcon_menu_item_get_icon_name (item-item);
item-icon_large = xfce_appfinder_model_load_pixbuf (name,
ICON_LARGE);
diff --git a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
index 635adda..9d8065e 100644
--- a/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
+++ b/xfce4-appfinder/merge-with-xfrun/demo-code/c/appfinder-window.c
@@ -542,7 +542,7 @@ xfce_appfinder_window_item_changed (XfceAppfinderWindow
*window)
if (can_launch)
{
- gtk_tree_model_get (model, iter,
XFCE_APPFINDER_MODEL_COLUMN_ICON_SMALL, pixbuf, -1);
+ gtk_tree_model_get (model, iter,
XFCE_APPFINDER_MODEL_COLUMN_ICON_LARGE, pixbuf, -1);
if (G_LIKELY (pixbuf != NULL))
{
xfce_appfinder_window_update_image (window, pixbuf);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:nick/gettext Update translators, week 22.
Updating branch refs/heads/nick/gettext to 7a1aeccba882f9dca1dc2cc15ac85d33b7f2145f (commit) from 2e817ce7a4980221c4dc1e0df6f197885cd83d3f (commit) commit 7a1aeccba882f9dca1dc2cc15ac85d33b7f2145f Author: Transifex norep...@xfce.org Date: Sun Jun 5 00:00:09 2011 +0200 Update translators, week 22. lib/translators.php |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/lib/translators.php b/lib/translators.php index eb82cca..028467a 100644 --- a/lib/translators.php +++ b/lib/translators.php @@ -4,7 +4,7 @@ * DO NOT EDIT IT MANUALLY! */ -$translators_stamp = 2011-05-29 00:00:10; +$translators_stamp = 2011-06-05 00:00:07; $translators = array ( 'Amharic [am]' = array ( @@ -73,6 +73,9 @@ $translators = array ( 'English (United Kingdom) [en_GB]' = array ( 'Jeff Bailes' = 'thepizzaking'.ATSIGN.'gmail'.DOTSIGN.'com', ), + 'Esperanto [eo]' = array ( +'Michael Moroni' = 'michael'.DOTSIGN.'moroni'.ATSIGN.'mailoo'.DOTSIGN.'org', + ), 'Spanish (Castilian) [es]' = array ( 'Abel Martín' = 'abel'.DOTSIGN.'martin'.DOTSIGN.'ruiz'.ATSIGN.'gmail'.DOTSIGN.'com', 'Javier Sánchez Reinosa' = 'donoban'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -188,6 +191,7 @@ $translators = array ( ), 'Portuguese (Brazilian) [pt_BR]' = array ( 'Henrique P'.DOTSIGN.' Machado' = 'zehrique'.ATSIGN.'gmail'.DOTSIGN.'com', +'Jonas agx' = 'jonas'.DOTSIGN.'agx'.ATSIGN.'gmail'.DOTSIGN.'com', 'Joelso Andrade' = 'kosmofilo'.ATSIGN.'ymail'.DOTSIGN.'com', 'Michel Boaventura' = 'michel'.DOTSIGN.'boaventura'.ATSIGN.'gmail'.DOTSIGN.'com', 'Sérgio Cipolla' = 'secipolla'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -205,6 +209,7 @@ $translators = array ( '0leg' = 's'.ATSIGN.'0leg'.DOTSIGN.'me', 'Alexander Yashkin' = 'alex'.DOTSIGN.'aspirine'.ATSIGN.'gmail'.DOTSIGN.'com', 'Claque' = 'cpt-alatriste'.ATSIGN.'ya'.DOTSIGN.'ru', +'Sergey Davidoff' = 'shnatsel'.ATSIGN.'gmail'.DOTSIGN.'com', 'Styopa Semenukha' = 'semenukha'.ATSIGN.'gmail'.DOTSIGN.'com', 'Aleksandr Ponomarenko' = 'davian818'.ATSIGN.'gmail'.DOTSIGN.'com', 'Ivan Nikolaev' = 'voidexp'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -212,12 +217,14 @@ $translators = array ( 'Alexandr Boltris' = 'ua2fgb'.ATSIGN.'gmail'.DOTSIGN.'com', 'Artem Zolochevskiy' = 'artem'.DOTSIGN.'zolochevskiy'.ATSIGN.'gmail'.DOTSIGN.'com', 'Evgeniy Kosov' = 'eugene'.ATSIGN.'kosov'.DOTSIGN.'net', +'gnulinux' = 'nazarov-1990'.ATSIGN.'bk'.DOTSIGN.'ru', 'Vlad Vasilev' = 'lortwer'.ATSIGN.'gmail'.DOTSIGN.'com', 'Alexander Matveyev' = 'a'.DOTSIGN.'s'.DOTSIGN.'matveyev'.ATSIGN.'gmail'.DOTSIGN.'com', 'Denis Koryavov' = 'dkoryavov'.ATSIGN.'yandex'.DOTSIGN.'ru', 'Andres Kovtunos' = 'kovtunos'.ATSIGN.'yandex'.DOTSIGN.'ru', 'Dmitriy Kudryashov' = 'overmailed'.ATSIGN.'gmail'.DOTSIGN.'com', 'Sergey Abramkin' = 'sergey'.ATSIGN.'abramk'.DOTSIGN.'in', +'Leonid Eremin' = 'pan'.DOTSIGN.'sandurlay'.ATSIGN.'gmail'.DOTSIGN.'com', 'ton' = 'tonawuda'.ATSIGN.'inbox'.DOTSIGN.'ru', 'Victor Homyakov' = 'homyakov'.ATSIGN.'isida'.DOTSIGN.'by', ), ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Update translators, week 22.
Updating branch refs/heads/master
to 2503786d241ab8310e6c8f2fcea0a58db6cbaff7 (commit)
from b7e76186120fee3ec50b75a473e2568ae40dd6d7 (commit)
commit 2503786d241ab8310e6c8f2fcea0a58db6cbaff7
Author: Transifex norep...@xfce.org
Date: Sun Jun 5 00:00:12 2011 +0200
Update translators, week 22.
xfce4-about/translators.h | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 9fa6b59..8769694 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
-#define TRANSLATORS_H_STAMP 2011-05-29 00:00:15
+#define TRANSLATORS_H_STAMP 2011-06-05 00:00:12
#define ATSIGN @
#define DOTSIGN .
@@ -149,6 +149,12 @@ static const TranslatorInfo xfce_translators_en_GB[] =
{ NULL, NULL }
};
+static const TranslatorInfo xfce_translators_eo[] =
+{
+ { Michael Moroni, michael DOTSIGN moroni ATSIGN mailoo DOTSIGN
org, TRUE },
+ { NULL, NULL }
+};
+
static const TranslatorInfo xfce_translators_es[] =
{
{ Abel Martín, abel DOTSIGN martin DOTSIGN ruiz ATSIGN gmail
DOTSIGN com, TRUE },
@@ -343,6 +349,7 @@ static const TranslatorInfo xfce_translators_pt[] =
static const TranslatorInfo xfce_translators_pt_BR[] =
{
{ Henrique P DOTSIGN Machado, zehrique ATSIGN gmail DOTSIGN com,
TRUE },
+ { Jonas agx, jonas DOTSIGN agx ATSIGN gmail DOTSIGN com, FALSE },
{ Joelso Andrade, kosmofilo ATSIGN ymail DOTSIGN com, FALSE },
{ Michel Boaventura, michel DOTSIGN boaventura ATSIGN gmail DOTSIGN
com, FALSE },
{ Sérgio Cipolla, secipolla ATSIGN gmail DOTSIGN com, FALSE },
@@ -366,6 +373,7 @@ static const TranslatorInfo xfce_translators_ru[] =
{ 0leg, s ATSIGN 0leg DOTSIGN me, FALSE },
{ Alexander Yashkin, alex DOTSIGN aspirine ATSIGN gmail DOTSIGN
com, FALSE },
{ Claque, cpt-alatriste ATSIGN ya DOTSIGN ru, FALSE },
+ { Sergey Davidoff, shnatsel ATSIGN gmail DOTSIGN com, FALSE },
{ Styopa Semenukha, semenukha ATSIGN gmail DOTSIGN com, FALSE },
{ Aleksandr Ponomarenko, davian818 ATSIGN gmail DOTSIGN com, FALSE },
{ Ivan Nikolaev, voidexp ATSIGN gmail DOTSIGN com, FALSE },
@@ -373,12 +381,14 @@ static const TranslatorInfo xfce_translators_ru[] =
{ Alexandr Boltris, ua2fgb ATSIGN gmail DOTSIGN com, FALSE },
{ Artem Zolochevskiy, artem DOTSIGN zolochevskiy ATSIGN gmail
DOTSIGN com, FALSE },
{ Evgeniy Kosov, eugene ATSIGN kosov DOTSIGN net, FALSE },
+ { gnulinux, nazarov-1990 ATSIGN bk DOTSIGN ru, FALSE },
{ Vlad Vasilev, lortwer ATSIGN gmail DOTSIGN com, FALSE },
{ Alexander Matveyev, a DOTSIGN s DOTSIGN matveyev ATSIGN gmail
DOTSIGN com, FALSE },
{ Denis Koryavov, dkoryavov ATSIGN yandex DOTSIGN ru, FALSE },
{ Andres Kovtunos, kovtunos ATSIGN yandex DOTSIGN ru, FALSE },
{ Dmitriy Kudryashov, overmailed ATSIGN gmail DOTSIGN com, FALSE },
{ Sergey Abramkin, sergey ATSIGN abramk DOTSIGN in, FALSE },
+ { Leonid Eremin, pan DOTSIGN sandurlay ATSIGN gmail DOTSIGN com,
FALSE },
{ ton, tonawuda ATSIGN inbox DOTSIGN ru, FALSE },
{ Victor Homyakov, homyakov ATSIGN isida DOTSIGN by, FALSE },
{ NULL, NULL }
@@ -551,6 +561,7 @@ static const TranslatorTeam xfce_translators[] =
{ German, de, xfce_translators_de },
{ Greek, el, xfce_translators_el },
{ English (United Kingdom), en_GB, xfce_translators_en_GB },
+ { Esperanto, eo, xfce_translators_eo },
{ Spanish (Castilian), es, xfce_translators_es },
{ Spanish (Argentinian), es_AR, xfce_translators_es_AR },
{ Basque, eu, xfce_translators_eu },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] design:master Work on DnD, entirely experimental though.
Updating branch refs/heads/master
to 883cf7f2623c63c28e237d8f4c9011760a9708c0 (commit)
from 6106a699ed82d7a1c8ab5de5ac1a42e711f3e5e2 (commit)
commit 883cf7f2623c63c28e237d8f4c9011760a9708c0
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Jun 5 01:36:51 2011 +0200
Work on DnD, entirely experimental though.
.../demo-code/custom-view/drag-source.vala | 27 +++
.../demo-code/custom-view/mockup.vala | 19 ++-
.../demo-code/custom-view/shortcut-row.vala| 11 +-
.../demo-code/custom-view/shortcuts-view.vala | 236 ++--
4 files changed, 271 insertions(+), 22 deletions(-)
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
b/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
index baaa0cf..1d8a763 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/drag-source.vala
@@ -24,11 +24,38 @@ using Gtk;
class DragSource : EventBox {
+ public static enum DragInfo {
+TEXT_URI_LIST
+ }
+
public string location { get; set; }
public DragSource (string location) {
this.location = location;
+TargetEntry targets[1] = {
+ TargetEntry () {
+target = text/uri-list,
+flags = 0,
+info = DragInfo.TEXT_URI_LIST
+ }
+};
+
+drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, targets,
Gdk.DragAction.COPY);
+
+drag_begin.connect ((context) = {
+ debug (drag begin);
+});
+
+drag_data_get.connect ((context, selection_data, info, time) = {
+ debug (drag data get);
+ selection_data.set_uris (new string[] { location });
+});
+
+drag_end.connect ((context) = {
+ debug (drag end);
+});
+
var label = new Label (this.location);
add (label);
label.show ();
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
b/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
index 77a7484..72adee5 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/mockup.vala
@@ -55,12 +55,27 @@ int main (string[] args) {
viewport.add (view);
view.show ();
+ var drag_frame = new Frame (null);
+ drag_frame.set_label_align (0.5f, 0.5f);
+ box.pack_start (drag_frame, false, true, 0);
+ drag_frame.show ();
+
+ var drag_frame_label = new Label (bDrag us/b);
+ drag_frame_label.set_use_markup (true);
+ drag_frame.set_label_widget (drag_frame_label);
+ drag_frame_label.show ();
+
+ var drag_sources = new VBox (false, 6);
+ drag_sources.set_border_width (6);
+ drag_frame.add (drag_sources);
+ drag_sources.show ();
+
var local_file = new DragSource (file:///home/jannis/foo.txt);
- box.pack_start (local_file, false, true, 0);
+ drag_sources.pack_start (local_file, false, true, 0);
local_file.show ();
var remote_uri = new DragSource (sftp://xfce.org/home/jannis/bar.txt;);
- box.pack_start (remote_uri, false, true, 0);
+ drag_sources.pack_start (remote_uri, false, true, 0);
remote_uri.show ();
window.show ();
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
b/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
index 0ef1b6f..b6bad1a 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/shortcut-row.vala
@@ -26,13 +26,14 @@ public class ShortcutRow : EventBox {
public string title { get; set; }
public string icon_name { get; set; }
public bool connected { get; set; }
+ public bool is_drop_target { get; set; default = false; }
private Image disconnect_icon { get; set; }
private Image cancel_icon { get; set; }
private Button button { get; set; }
private Spinner spinner { get; set; }
- public ShortcutRow (string title, string icon_name, bool connected) {
+ public ShortcutRow (string? title, string? icon_name, bool connected) {
this.title = title;
this.icon_name = icon_name;
this.connected = connected;
@@ -49,6 +50,14 @@ public class ShortcutRow : EventBox {
align.add (box);
box.show ();
+notify[is-drop-target].connect (() = {
+ if (this.is_drop_target) {
+drag_highlight (box);
+ } else {
+drag_unhighlight (box);
+ }
+});
+
var icon = new Image.from_icon_name (icon_name, IconSize.MENU);
box.pack_start (icon, false, true, 0);
icon.show ();
diff --git a/thunar/shortcuts-pane/demo-code/custom-view/shortcuts-view.vala
b/thunar/shortcuts-pane/demo-code/custom-view/shortcuts-view.vala
index c934a2a..c1fc5e3 100644
--- a/thunar/shortcuts-pane/demo-code/custom-view/shortcuts-view.vala
+++ b/thunar/shortcuts-pane/demo-code/custom-view/shortcuts-view.vala
@@ -24,9 +24,11 @@ using Gtk;
public class Category : GLib.Object {
public string name { get; set; }
+ public bool supports_bookmarks { get; set; default = false; }
- public Category
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Creating branch jannis/new-shortcuts-pane
Updating branch refs/heads/jannis/new-shortcuts-pane as new branch to fcf64f29b78a7e24b27f9494a6073c1247769024 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/jannis/new-shortcuts-pane for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to a637acdd748fe1160abae150f94496a494e006f1 (commit) from 963bdf2376c7be8c4eff11efd6b4cd4c3cc86f8b (commit) commit a637acdd748fe1160abae150f94496a494e006f1 Author: Chipong Luo chipon...@yahoo.com Date: Sun Jun 5 02:48:28 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 666 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 94 -- 1 files changed, 26 insertions(+), 68 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2f98acf..5233719 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -101,9 +101,7 @@ msgid Privacy msgstr 隐私 #: ../midori/main.c:744 -msgid -Cookies store login data, saved games, or user profiles for advertisement -purposes. +msgid Cookies store login data, saved games, or user profiles for advertisement purposes. msgstr Cookie 保存了登录数据、游戏状态或者与广告目的相关的资料。 #: ../midori/main.c:818 ../midori/main.c:1073 @@ -112,17 +110,12 @@ msgid The session couldn't be saved. %s msgstr 无法保存会话。%s #: ../midori/main.c:1024 -msgid -No root certificate file is available. SSL certificates cannot be verified. +msgid No root certificate file is available. SSL certificates cannot be verified. msgstr 无可用的根证书文件。SSL 证书无法认证。 #: ../midori/main.c:1108 -msgid -Midori seems to have crashed the last time it was opened. If this happened -repeatedly, try one of the following options to solve the problem. -msgstr -Midori 浏览器在上次运行时好像崩溃了。如果这种情况反复出现，请尝试下面的选项来 -解决此问题。 +msgid Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem. +msgstr Midori 浏览器在上次运行时好像崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此问题。 #: ../midori/main.c:1124 msgid Modify _preferences @@ -221,11 +214,11 @@ msgstr SECONDS #: ../midori/main.c:1968 msgid Redirects console warnings to the specified FILENAME -msgstr +msgstr 重定向控制台警告信息至指定的 FILENAME #: ../midori/main.c:1968 msgid FILENAME -msgstr +msgstr FILENAME #: ../midori/main.c:2052 msgid [Addresses] @@ -437,16 +430,11 @@ msgstr 打开文件 #: ../midori/midori-browser.c:2352 msgid -To use the above URI open a news aggregator. There is usually a menu or -button \New Subscription\, \New News Feed\ or similar.\n -Alternatively go to Preferences, Applications in Midori, and select a News -Aggregator. Next time you click the news feed icon, it will be added -automatically. +To use the above URI open a news aggregator. There is usually a menu or button \New Subscription\, \New News Feed\ or similar.\n +Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically. msgstr -要使用上面的 URI 打开一个新闻聚合。通常都有名为 \新订阅\ 、 \新新闻订阅\ -或者类似的菜单项或者按钮。\n -首选项是 Midori 的一个程序，您也可以选择进入其中选择一个新闻聚合。当您再次点 -击新闻订阅的图标时，该订阅将自动被添加。 +要使用上面的 URI 打开一个新闻聚合。通常都有名为 \新订阅\ 、 \新新闻订阅\ 或者类似的菜单项或者按钮。\n +首选项是 Midori 的一个程序，您也可以选择进入其中选择一个新闻聚合。当您再次点击新闻订阅的图标时，该订阅将自动被添加。 #: ../midori/midori-browser.c:2358 ../extensions/feed-panel/main.c:365 msgid New feed @@ -583,15 +571,8 @@ msgid See about:version for version info. msgstr 查看 about:version 获取版本信息。 #: ../midori/midori-browser.c:4703 -msgid -This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published by the -Free Software Foundation; either version 2.1 of the License, or (at your -option) any later version. -msgstr -本软件库是自由软件；您可以在自由软件基金会发布的 GNU 较宽松公共许可协议(LGPL) -条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本或者（由您自行选择） -更高的版本。 +msgid This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. +msgstr 本软件库是自由软件；您可以在自由软件基金会发布的 GNU 较宽松公共许可协议(LGPL)条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本或者（由您自行选择）更高的版本。 #: ../midori/midori-browser.c:4722 msgid translator-credits @@ -1672,12 +1653,8 @@ msgid Preferred languages msgstr 首选语言 #: ../midori/midori-websettings.c:937 -msgid -A comma separated list of languages preferred for rendering multilingual -webpages, for example \de\, \ru,nl\ or \en-us;q=1.0, fr-fr;q=0.667\ -msgstr -一个由逗号分隔的多语言网页首选语言列表，例如 \de\，\ru,nl\ 或者 \en-us; -q=1.0, fr-fr;q=0.667\ +msgid A comma separated list of languages preferred for rendering multilingual webpages, for example \de\, \ru,nl\ or \en-us;q=1.0, fr-fr;q=0.667\ +msgstr 一个由逗号分隔的多语言网页首选语言列表，例如 \de\，\ru,nl\ 或者 \en-us;q=1.0, fr-fr;q=0.667\ #: ../midori/midori-websettings.c:952 msgid Clear private data @@ -2206,11 +2183,8 @@ msgid The downloaded file is erroneous. msgstr 已下载的文件不正确。 #: ../toolbars/midori-transferbar.c:218 -msgid -The checksum provided with the link did not match. This means the file is -probably incomplete or was modified
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Deleting branch jannis/new-shortcuts-pane
Deleting branch refs/heads/jannis/new-shortcuts-pane ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Creating branch jannis/new-shortcuts-pane
Updating branch refs/heads/jannis/new-shortcuts-pane as new branch to 0e3cd36940f5d156c1a73c338b516741a47c85a4 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/jannis/new-shortcuts-pane for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Use a GtkTreeView for the model; work on shortcuts view construction.
Updating branch refs/heads/jannis/new-shortcuts-pane
to 480a3e26db18991f340423a1c11df3865c5737bc (commit)
from 0e3cd36940f5d156c1a73c338b516741a47c85a4 (commit)
commit 480a3e26db18991f340423a1c11df3865c5737bc
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Jun 5 03:44:27 2011 +0200
Use a GtkTreeView for the model; work on shortcuts view construction.
thunar/thunar-shortcuts-view.c | 51 ---
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 5e225b3..925fc3e 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -66,6 +66,7 @@ enum
+static void thunar_shortcuts_view_constructed (GObject *object);
static void thunar_shortcuts_view_finalize (GObject *object);
static void thunar_shortcuts_view_get_property (GObject *object,
guint prop_id,
@@ -85,9 +86,10 @@ struct _ThunarShortcutsViewClass
struct _ThunarShortcutsView
{
- GtkEventBox __parent__;
+ GtkEventBox __parent__;
- ThunarShortcutsModel *model;
+ GtkTreeModel *model;
+ GtkWidget*expander_box;
};
@@ -107,6 +109,7 @@ thunar_shortcuts_view_class_init (ThunarShortcutsViewClass
*klass)
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class-constructed = thunar_shortcuts_view_constructed;
gobject_class-finalize = thunar_shortcuts_view_finalize;
gobject_class-get_property = thunar_shortcuts_view_get_property;
gobject_class-set_property = thunar_shortcuts_view_set_property;
@@ -114,14 +117,14 @@ thunar_shortcuts_view_class_init
(ThunarShortcutsViewClass *klass)
/**
* ThunarShortcutsView:model:
*
- * The #ThunarShortcutsModel associated with this view.
+ * The #GtkTreeModel associated with this view.
**/
g_object_class_install_property (gobject_class,
PROP_MODEL,
g_param_spec_object (model,
model,
model,
-
THUNAR_TYPE_SHORTCUTS_MODEL,
+GTK_TYPE_TREE_MODEL,
EXO_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
@@ -173,7 +176,47 @@ thunar_shortcuts_view_class_init (ThunarShortcutsViewClass
*klass)
static void
thunar_shortcuts_view_init (ThunarShortcutsView *view)
{
+ GtkWidget *alignment;
+
view-model = NULL;
+
+ alignment = gtk_alignment_new (0.0f, 0.0f, 1.0f, 1.0f);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 4, 4, 0, 0);
+ gtk_container_add (GTK_CONTAINER (view), alignment);
+ gtk_widget_show (alignment);
+
+ view-expander_box = gtk_vbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (alignment), view-expander_box);
+ gtk_widget_show (view-expander_box);
+}
+
+
+
+static void
+thunar_shortcuts_view_constructed (GObject *object)
+{
+ ThunarShortcutsView *view = THUNAR_SHORTCUTS_VIEW (object);
+ GtkTreeIter iter;
+ gboolean valid_iter = FALSE;
+
+ /* chain up to the parent class */
+ (*G_OBJECT_CLASS (thunar_shortcuts_view_parent_class)-constructed) (object);
+
+ /* do nothing if we don't have a model set */
+ if (view-model == NULL)
+return;
+
+ /* iterate over all items in the shortcuts model */
+ valid_iter = gtk_tree_model_get_iter_first (view-model, iter);
+ while (valid_iter)
+{
+ /* TODO read values from the row and create an expander,
+ * shortcut row or drop placeholder, depending on the
+ * row values */
+
+ /* advance to the next row */
+ valid_iter = gtk_tree_model_iter_next (view-model, iter);
+}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
