[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 87b0e2e816a46e137b3da4fb7594af59ab48beca (commit) from 3fd98a2aed1d304e8ff1f32b1c1c35c17ebbd099 (commit) commit 87b0e2e816a46e137b3da4fb7594af59ab48beca Author: Cristian Marchi Date: Thu Sep 22 08:51:01 2011 +0200 l10n: Updated Italian (it) translation to 100% New status: 139 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 174 +++-- 1 files changed, 100 insertions(+), 74 deletions(-) diff --git a/po/it.po b/po/it.po index ef4df78..c1ae608 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-14 17:05+\n" +"POT-Creation-Date: 2011-09-22 04:10+\n" "PO-Revision-Date: 2010-03-03 15:54+0100\n" "Last-Translator: Gianluca Foddis \n" "Language-Team: Italian\n" @@ -70,7 +70,7 @@ msgstr "WebDAV" msgid "WebDAV (secure)" msgstr "WebDAV (sicuro)" -#: ../src/common.c:93 ../src/window.c:1395 +#: ../src/common.c:93 ../src/window.c:1506 msgid "Network" msgstr "Rete" @@ -86,163 +86,181 @@ msgstr "Foto" msgid "Custom Location" msgstr "Posizione personalizzata" -#: ../src/window.c:261 +#: ../src/window.c:262 #, c-format msgid "Connecting to \"%s\"" msgstr "Connessione a «%s» in corso" -#: ../src/window.c:429 +#: ../src/window.c:430 msgid "A simple frontend to easily connect/mount to local and remote filesystems" msgstr "Una semplice interfaccia per connettere e montare i file system remoti" -#: ../src/window.c:430 +#: ../src/window.c:431 msgid "Copyright 2008-2011 Enrico Tröger" msgstr "Copyright 2008-2011 Enrico Tröger" -#: ../src/window.c:433 +#: ../src/window.c:434 msgid "translator-credits" msgstr "" "Muflone \n" "Gianluca Foddis " -#: ../src/window.c:465 +#: ../src/window.c:466 msgid "Gigolo can use the following protocols provided by GVfs:" msgstr "Gigolo può utilizzare i seguenti protocolli forniti da GVfs:" -#: ../src/window.c:562 +#: ../src/window.c:579 ../src/window.c:638 #, c-format msgid "The command '%s' failed" msgstr "Il comando '%s' non è riuscito" -#: ../src/window.c:563 ../src/window.c:700 ../src/bookmarkeditdialog.c:220 +#: ../src/window.c:580 ../src/window.c:613 ../src/window.c:626 +#: ../src/window.c:639 ../src/window.c:797 ../src/bookmarkeditdialog.c:220 #: ../src/bookmarkeditdialog.c:239 ../src/bookmarkeditdialog.c:252 #: ../src/bookmarkeditdialog.c:263 ../src/bookmarkeditdialog.c:274 msgid "Error" msgstr "Errore" #: ../src/window.c:613 +msgid "Invalid terminal command" +msgstr "Comando del terminale non valido" + +#: ../src/window.c:625 +#, c-format +msgid "No default location available for \"%s\"" +msgstr "Nessuna posizione predefinita disponibile per \"%s\"" + +#: ../src/window.c:705 msgid "Edit _Bookmark" msgstr "_Modifica segnalibro" -#: ../src/window.c:615 ../src/window.c:1189 ../src/browsenetworkpanel.c:453 +#: ../src/window.c:707 ../src/window.c:1287 ../src/browsenetworkpanel.c:453 #: ../src/browsenetworkpanel.c:497 msgid "Create _Bookmark" msgstr "Crea un s_egnalibro" -#: ../src/window.c:1181 +#: ../src/window.c:1279 msgid "_File" msgstr "_File" -#: ../src/window.c:1182 +#: ../src/window.c:1280 msgid "_Edit" msgstr "_Modifica" -#: ../src/window.c:1183 +#: ../src/window.c:1281 msgid "_Actions" msgstr "_Azioni" -#: ../src/window.c:1184 +#: ../src/window.c:1282 msgid "_View" msgstr "_Visualizzazione" -#: ../src/window.c:1185 +#: ../src/window.c:1283 msgid "_Help" msgstr "A_iuto" -#: ../src/window.c:1191 +#: ../src/window.c:1289 msgid "_Edit Bookmarks" msgstr "_Modifica segnalibri" -#: ../src/window.c:1192 +#: ../src/window.c:1290 msgid "Open the bookmark manager to add, edit or delete bookmarks" msgstr "Apre il gestore di segnalibri per aggiungere, modificare o eliminare i collegamenti preferiti" -#: ../src/window.c:1196 +#: ../src/window.c:1294 msgid "Disconnect the selected resource" msgstr "Disconnette la risorsa selezionata" -#: ../src/window.c:1198 +#: ../src/window.c:1296 msgid "Open the selected resource with a file manager" msgstr "Apre la risorsa selezionata con un gestore di file" -#: ../src/window.c:1199 +#: ../src/window.c:1297 +msgid "Open in _Terminal" +msgstr "Apri nel _terminale" + +#: ../src/window.c:1298 +msgid "Start a terminal from here" +msgstr "Avvia un terminale da qui" + +#: ../src/window.c:1299 msgid "Copy _URI" msgstr "Copia _URI" -#: ../src/window.c:1200 +#: ../src/window.c:1300 msgid "Quit Gigolo" msgstr "Esci da Gigolo" -#: ../src/window.c:1201 +#: ../src/window.c:1301 msgid "Online Help" msgstr "Aiuto in linea" -#: ../src/window.c:1202 +#: ../src/window.c:1302 msgid "Supported Protocols" msgstr "Protocolli supportati" -#: ../src/window.c:1208 +#: ../src/window.c:1308 msgid "Side _Panel" msgstr "_Pannello laterale" -#: ../src/win
[Xfce4-commits] l10n: Updated Chinese (Taiwan) (zh_TW) translation to 56%
Updating branch refs/heads/master to aabb28f09acd4b6ee4b6e662e1c4217350ddca7e (commit) from e64f77f5585113274b39fa76ac1a1c82f93adb45 (commit) commit aabb28f09acd4b6ee4b6e662e1c4217350ddca7e Author: Chia-Han Lee Date: Thu Sep 22 04:37:29 2011 +0200 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 56% New status: 159 messages complete with 56 fuzzies and 68 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 111 +++--- 1 files changed, 59 insertions(+), 52 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 7b8930c..57dea8e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xfburn 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-21 04:02+\n" +"POT-Creation-Date: 2011-09-21 22:02+\n" "PO-Revision-Date: 2006-08-20 01:09+0800\n" "Last-Translator: Cosmo Chene \n" "Language-Team: Chinese (traditional) \n" @@ -208,12 +208,12 @@ msgstr "寫入ISO時發生錯誤: %s" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:548 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:554 msgid "An error occurred in the burn backend." -msgstr "" +msgstr "燒錄結尾發生錯誤" #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:571 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:327 msgid "The write mode is not supported currently." -msgstr "" +msgstr "目前不支援寫入模式" #. could not create source #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:653 @@ -250,7 +250,7 @@ msgstr "" #: ../xfburn/xfburn-burn-image-dialog.c:322 #: ../xfburn/xfburn-burn-image-dialog.c:351 msgid "An error occurred in the burn backend" -msgstr "" +msgstr "燒錄結尾發生錯誤" #: ../xfburn/xfburn-burn-image-dialog.c:335 msgid "Unable to determine image size." @@ -509,16 +509,18 @@ msgid "Is it a valid combination" msgstr "" #: ../xfburn/xfburn-device-box.c:187 +#, fuzzy msgid "Is the combination of hardware and disc valid to burn the composition?" -msgstr "" +msgstr "硬體和光碟的組合是否能燒錄清單?" #: ../xfburn/xfburn-device-box.c:191 msgid "The blank mode shows different disc status messages than regular mode" -msgstr "" +msgstr "抹除模式和正常模式顯示不同的光碟狀態" #: ../xfburn/xfburn-device-box.c:194 ../xfburn/xfburn-device-box.c:195 +#, fuzzy msgid "Accept only CDs as valid discs" -msgstr "" +msgstr "只接受CD光碟片" #: ../xfburn/xfburn-device-box.c:248 #, fuzzy @@ -535,6 +537,7 @@ msgid "Empty speed list" msgstr "" #: ../xfburn/xfburn-device-box.c:397 +#, fuzzy msgid "" "Unable to retrieve the speed list for the drive.\n" "\n" @@ -544,10 +547,17 @@ msgid "" "\n" "Thank you!" msgstr "" +"無法取得光碟機的速度清單\n" +"\n" +"這個bug已知會發生在某些光碟機上 請回報到 xfb...@xfce.org 並附上顯示的訊息以增加修復的機會 \n" +"\n" +"應該能正常燒錄, 但如果有發生任何問題請讓我們知道 \n" +"\n" +"謝謝!" #: ../xfburn/xfburn-device-box.c:406 msgid "Continue to _show this notice" -msgstr "" +msgstr "繼續顯示這個提示(_S)" #: ../xfburn/xfburn-device-box.c:448 #, fuzzy @@ -556,15 +566,17 @@ msgstr "預設" #: ../xfburn/xfburn-device-box.c:484 msgid "Max" -msgstr "" +msgstr "最大" #: ../xfburn/xfburn-device-box.c:586 +#, fuzzy msgid "Drive can't burn on the inserted disc" -msgstr "" +msgstr "燒錄器無法燒錄放入的光碟片" #: ../xfburn/xfburn-device-box.c:595 ../xfburn/xfburn-device-box.c:641 +#, fuzzy msgid "Drive is empty" -msgstr "" +msgstr "燒錄器是空的" #: ../xfburn/xfburn-device-box.c:598 msgid "Sorry, multisession is not yet supported" @@ -572,40 +584,43 @@ msgstr "" #: ../xfburn/xfburn-device-box.c:601 msgid "Inserted disc is full" -msgstr "" +msgstr "放入的光碟片已滿" #: ../xfburn/xfburn-device-box.c:604 ../xfburn/xfburn-device-box.c:647 msgid "Inserted disc is unsuitable" -msgstr "" +msgstr "放入了不適當的光碟片" #: ../xfburn/xfburn-device-box.c:607 ../xfburn/xfburn-device-box.c:650 +#, fuzzy msgid "Cannot access drive (it might be in use)" -msgstr "" +msgstr "無法連接燒錄器(可能在使用中)" #: ../xfburn/xfburn-device-box.c:612 ../xfburn/xfburn-device-box.c:653 +#, fuzzy msgid "Error determining disc" -msgstr "" +msgstr "偵測光碟片時發生錯誤" #: ../xfburn/xfburn-device-box.c:633 +#, fuzzy msgid "Write-once disc, no blanking possible" -msgstr "" +msgstr "只能燒錄一次的光碟片,無法被抹除" #: ../xfburn/xfburn-device-box.c:636 msgid "DVD+RW does not need blanking" -msgstr "" +msgstr "DVD+RW 不需要抹除" #: ../xfburn/xfburn-device-box.c:644 +#, fuzzy msgid "Inserted disc is already blank" -msgstr "" +msgstr "放入的光碟片已經是空白的了" #: ../xfburn/xfburn-device-box.c:680 -#, fuzzy msgid "Auto" -msgstr "關於(_A)" +msgstr "自動" #: ../xfburn/xfburn-device-list.c:206 ../xfburn/xfburn-device-list.c:207 msgid "Number of burners in the system" -msgstr "" +msgstr "系統中燒錄器的數量" #: ../xfburn/xfburn-device-list.c:209 msgid "Number of drives in the system" @@ -616,14 +631,12 @@ msgid "Number of drives in the system (readers and writers)" msgstr "" #: ../xfburn/xfburn-device-list.c:212 ../xfburn/xfburn-device-list.c:213 -#, fuzzy msgid "List of devices" -msgstr "掃描燒錄裝置(_A)" +msgstr "裝置清單" #: ..
[Xfce4-commits] Fix bogus semicolon in midori_view_set_uri
Updating branch refs/heads/master
to b8c707f1cbcf9a86b6a12f88283353300805e8ad (commit)
from a49c6e8ad75b9ce3d87dffda948a86d5e78eebcc (commit)
commit b8c707f1cbcf9a86b6a12f88283353300805e8ad
Author: Christian Dywan
Date: Thu Sep 22 00:27:55 2011 +0200
Fix bogus semicolon in midori_view_set_uri
midori/midori-view.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index e426e7f..9260872 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3849,7 +3849,7 @@ midori_view_set_uri (MidoriView* view,
katze_assign (view->uri, g_strdup (""));
katze_item_set_uri (view->item, "");
-if (speeddial_markup == NULL);
+if (speeddial_markup == NULL)
speeddial_markup = prepare_speed_dial_html (view);
midori_view_load_alternate_string (view,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Switch to already open tab of external URI if possible
Updating branch refs/heads/master
to a49c6e8ad75b9ce3d87dffda948a86d5e78eebcc (commit)
from 648d869e4ff69f121da97484a0fd553b005ca751 (commit)
commit a49c6e8ad75b9ce3d87dffda948a86d5e78eebcc
Author: Christian Dywan
Date: Thu Sep 22 00:26:49 2011 +0200
Switch to already open tab of external URI if possible
midori/midori-app.c | 21 +++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/midori/midori-app.c b/midori/midori-app.c
index bb9b5b6..26b81ce 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -500,8 +500,25 @@ midori_app_command_received (MidoriApp* app,
first = FALSE;
}
else
-midori_browser_set_current_page (browser,
-midori_browser_add_uri (browser, fixed_uri));
+{
+/* Switch to already open tab if possible */
+guint i = 0;
+GtkWidget* tab;
+gboolean found = FALSE;
+while ((tab = midori_browser_get_nth_tab (browser,
i++)))
+if (g_str_equal (
+midori_view_get_display_uri (MIDORI_VIEW
(tab)),
+fixed_uri))
+{
+found = TRUE;
+break;
+}
+if (found)
+midori_browser_set_current_tab (browser, tab);
+else
+midori_browser_set_current_page (browser,
+midori_browser_add_uri (browser, fixed_uri));
+}
}
g_free (fixed_uri);
uris++;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use DOM API to get selected text in WebKitGTK+ 1.5.1
Updating branch refs/heads/master
to 648d869e4ff69f121da97484a0fd553b005ca751 (commit)
from 24604a3db6f609e8df1b991f697155f51351316e (commit)
commit 648d869e4ff69f121da97484a0fd553b005ca751
Author: Christian Dywan
Date: Wed Sep 21 23:50:51 2011 +0200
Use DOM API to get selected text in WebKitGTK+ 1.5.1
Fixes: https://bugs.launchpad.net/midori/+bug/799603
midori/midori-view.c | 25 +
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 0d7a96e..e426e7f 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -39,9 +39,11 @@
#include
#endif
+#if !WEBKIT_CHECK_VERSION (1, 5, 1)
/* This is unstable API, so we need to declare it */
gchar*
webkit_web_view_get_selected_text (WebKitWebView* web_view);
+#endif
static void
midori_view_construct_web_view (MidoriView* view);
@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
gboolean
midori_view_has_selection (MidoriView* view)
{
+#if WEBKIT_CHECK_VERSION (1, 5, 1)
+WebKitDOMDocument* doc;
+WebKitDOMDOMWindow* window;
+WebKitDOMDOMSelection* selection;
+WebKitDOMRange* range;
+#endif
+
g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
+
+#if WEBKIT_CHECK_VERSION (1, 5, 1)
+doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
+window = webkit_dom_document_get_default_view (doc);
+selection = webkit_dom_dom_window_get_selection (window);
+if (selection == NULL)
+return FALSE;
+
+range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
+if (range == NULL)
+return FALSE;
+
+katze_assign (view->selected_text, webkit_dom_range_get_text (range));
+#else
katze_assign (view->selected_text, webkit_web_view_get_selected_text (
WEBKIT_WEB_VIEW (view->web_view)));
+#endif
+
if (view->selected_text && *view->selected_text)
return TRUE;
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove cookie feature after running cleanup callbacks
Updating branch refs/heads/master
to e4d03290d3ebb5db327d164458252bd3f8c510d8 (commit)
from bac3dc1842d98c5f42f1b8b576531c55f8b7cb41 (commit)
commit e4d03290d3ebb5db327d164458252bd3f8c510d8
Author: Paweł Forysiuk
Date: Wed Sep 21 23:07:53 2011 +0200
Remove cookie feature after running cleanup callbacks
midori/main.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 0230e49..0a4fa70 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2544,9 +2544,6 @@ main (intargc,
g_object_get (settings, "maximum-history-age", &max_history_age, NULL);
midori_history_terminate (history, max_history_age);
-/* Removing KatzeHttpCookies makes it save outstanding changes */
-soup_session_remove_feature_by_type (webkit_get_default_session (),
- KATZE_TYPE_HTTP_COOKIES);
/* Clear data on quit, according to the Clear private data dialog */
g_object_get (settings, "clear-private-data", &clear_prefs, NULL);
@@ -2568,6 +2565,10 @@ main (intargc,
g_free (clear_data);
}
+/* Removing KatzeHttpCookies makes it save outstanding changes */
+soup_session_remove_feature_by_type (webkit_get_default_session (),
+ KATZE_TYPE_HTTP_COOKIES);
+
load_on_startup = katze_object_get_int (settings, "load-on-startup");
if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Save compiled addon regexpes instead of strings
Updating branch refs/heads/master
to 24604a3db6f609e8df1b991f697155f51351316e (commit)
from e4d03290d3ebb5db327d164458252bd3f8c510d8 (commit)
commit 24604a3db6f609e8df1b991f697155f51351316e
Author: Paweł Forysiuk
Date: Wed Sep 21 23:28:43 2011 +0200
Save compiled addon regexpes instead of strings
extensions/addons.c | 35 ---
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/extensions/addons.c b/extensions/addons.c
index b2fb620..b6cf539 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -69,6 +69,9 @@ struct _Addons
static void
addons_iface_init (MidoriViewableIface* iface);
+static gchar*
+addons_convert_to_simple_regexp (const gchar* pattern);
+
G_DEFINE_TYPE_WITH_CODE (Addons, addons, GTK_TYPE_VBOX,
G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE,
addons_iface_init));
@@ -946,15 +949,19 @@ js_metadata_from_file (const gchar* filename,
}
else if (includes && g_str_has_prefix (line, "// @include"))
{
+ gchar* re = NULL;
rest_of_line = g_strdup (line + strlen ("// @include"));
rest_of_line = g_strstrip (rest_of_line);
- *includes = g_slist_prepend (*includes, rest_of_line);
+ re = addons_convert_to_simple_regexp (rest_of_line);
+ *includes = g_slist_prepend (*includes, re);
}
else if (excludes && g_str_has_prefix (line, "// @exclude"))
{
+ gchar* re = NULL;
rest_of_line = g_strdup (line + strlen ("// @exclude"));
rest_of_line = g_strstrip (rest_of_line);
- *excludes = g_slist_prepend (*excludes, rest_of_line);
+ re = addons_convert_to_simple_regexp (rest_of_line);
+ *excludes = g_slist_prepend (*excludes, re);
}
else if (name && g_str_has_prefix (line, "// @name"))
{
@@ -1031,6 +1038,8 @@ css_metadata_from_file (const gchar* filename,
{
guint begin, end;
gchar* domain;
+ gchar* tmp_domain;
+ gchar* re = NULL;
line_has_meta = TRUE;
begin = value[0] == '"' || value[0] == '\'' ? 1 : 0;
@@ -1039,15 +1048,15 @@ css_metadata_from_file (const gchar* filename,
++end;
domain = g_strndup (value + begin, end - begin * 2);
- if (!strncmp ("http", domain, 4))
- *includes = g_slist_prepend (*includes, domain);
+ if (strncmp ("http", domain, 4))
+ tmp_domain = g_strdup_printf ("http://*%s/*";,
domain);
else
- {
- *includes = g_slist_prepend (*includes,
- g_strdup_printf ("http://*%s/*";, domain));
- g_free (domain);
- }
+ tmp_domain = domain;
+
+ re = addons_convert_to_simple_regexp (tmp_domain);
+ *includes = g_slist_prepend (*includes, re);
g_free (value);
+ g_free (domain);
}
i++;
}
@@ -1405,9 +1414,7 @@ addons_may_run (const gchar* uri,
list = *includes;
while (list)
{
-gchar* re = addons_convert_to_simple_regexp (list->data);
-gboolean matched = g_regex_match_simple (re, uri, 0, 0);
-g_free (re);
+gboolean matched = g_regex_match_simple (list->data, uri, 0, 0);
if (matched)
{
match = TRUE;
@@ -1421,9 +1428,7 @@ addons_may_run (const gchar* uri,
list = *excludes;
while (list)
{
-gchar* re = addons_convert_to_simple_regexp (list->data);
-gboolean matched = g_regex_match_simple (re, uri, 0, 0);
-g_free (re);
+gboolean matched = g_regex_match_simple (list->data, uri, 0, 0);
if (matched)
{
match = FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h
Updating branch refs/heads/master
to bac3dc1842d98c5f42f1b8b576531c55f8b7cb41 (commit)
from fc21413b7efa1c1325eba96566b1eb9f9adb (commit)
commit bac3dc1842d98c5f42f1b8b576531c55f8b7cb41
Author: Christian Dywan
Date: Wed Sep 21 23:03:00 2011 +0200
Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h
The new header contains all state and event handling.
extensions/cookie-manager/cookie-manager-page.c |2 +-
extensions/feed-panel/feed-panel.c |2 +-
extensions/mouse-gestures.c |2 +-
extensions/tab-panel.c |2 +-
midori/midori-browser.c |7 +++--
midori/midori-locationaction.c |1 +
midori/midori-platform.h| 32 +++
midori/midori-searchaction.c|1 +
midori/midori-view.c|3 +-
midori/midori.h |1 +
midori/sokoke.h |6
11 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/extensions/cookie-manager/cookie-manager-page.c
b/extensions/cookie-manager/cookie-manager-page.c
index b6ab1c5..1db5d50 100644
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -933,7 +933,7 @@ static gboolean cm_tree_popup_menu_cb(GtkWidget *widget,
CookieManagerPage *cmp
static gboolean cm_tree_button_release_event_cb(GtkWidget *widget,
GdkEventButton *ev,
CookieManagerPage *cmp)
{
- if (ev->button == 3)
+ if (MIDORI_EVENT_CONTEXT_MENU(ev))
{
cm_tree_show_popup_menu(widget, ev, cmp);
return TRUE;
diff --git a/extensions/feed-panel/feed-panel.c
b/extensions/feed-panel/feed-panel.c
index 760dab6..052ca85 100644
--- a/extensions/feed-panel/feed-panel.c
+++ b/extensions/feed-panel/feed-panel.c
@@ -622,7 +622,7 @@ webview_button_press_event_cb (GtkWidget* widget,
GdkEventButton* event)
{
/* Disable the popup menu */
-return (event->button == 3);
+return MIDORI_EVENT_CONTEXT_MENU (event);
}
static gboolean
diff --git a/extensions/mouse-gestures.c b/extensions/mouse-gestures.c
index 6a3bf47..bbe38b4 100644
--- a/extensions/mouse-gestures.c
+++ b/extensions/mouse-gestures.c
@@ -187,7 +187,7 @@ mouse_gestures_button_release_event_cb (GtkWidget*
web_view,
mouse_gesture_clear (gesture);
}
-if (event->button == 3)
+if (MIDORI_EVENT_CONTEXT_MENU (event))
{
GtkWidget* menu = gtk_menu_new ();
midori_view_populate_popup (view, menu, TRUE);
diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index 4d58447..0c2291a 100644
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -406,7 +406,7 @@ tab_panel_toolitem_button_press_event_cb (GtkToolItem*
toolitem,
GdkEventButton* event,
GtkWidget* view)
{
-if (event->button == 3)
+if (MIDORI_EVENT_CONTEXT_MENU (event))
{
tab_panel_popup (GTK_WIDGET (toolitem), event, view);
return TRUE;
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5f11127..bd598b3 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -22,6 +22,7 @@
#include "midori-stock.h"
#include "midori-findbar.h"
#include "midori-transferbar.h"
+#include "midori-platform.h"
#include "gtkiconentry.h"
#include "marshal.h"
@@ -5062,7 +5063,7 @@ midori_browser_notebook_button_press_event_after_cb
(GtkNotebook*notebook,
return TRUE;
}
-else if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+else if (event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_CONTEXT_MENU
(event))
{
GtkWidget* menu = gtk_menu_new ();
GList* tabs = gtk_container_get_children (GTK_CONTAINER (notebook));
@@ -6379,7 +6380,7 @@ midori_browser_toolbar_item_button_press_event_cb
(GtkWidget* toolitem,
return _action_navigation_activate (action, browser);
}
-else if (event->button == 3)
+else if (MIDORI_EVENT_CONTEXT_MENU (event))
{
midori_browser_toolbar_popup_context_menu_cb (
GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
@@ -6621,7 +6622,7 @@ midori_bookmarkbar_item_button_press_event_cb (GtkWidget*
toolitem,
return TRUE;
}
}
-else if (event->button == 3)
+else if (MIDORI_EVENT_CONTEXT_MENU (event))
{
midori_browser_bookmark_popup (toolitem, NULL, item, browser);
return TRUE;
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index e7225ce..3a1d2e2 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationac
[Xfce4-commits] Add 'F' as another accelerator for fullscreen, fix bug #7817
Updating branch refs/heads/master
to ad23e1158d78bb54977971d9ab8718f407afa87e (commit)
from c8fbb5a46307dcfe7e4ffd8f69cdee18864c2b2f (commit)
commit ad23e1158d78bb54977971d9ab8718f407afa87e
Author: Stephan Arts
Date: Wed Sep 21 21:29:06 2011 +0200
Add 'F' as another accelerator for fullscreen, fix bug #7817
src/main_window.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index ebca286..0132984 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -393,6 +393,7 @@ rstto_main_window_init (RsttoMainWindow *window)
RsttoWallpaperManager *wallpaper_manager = NULL;
gchar *desktop_type = NULL;
+GClosure*toggle_fullscreen_closure = g_cclosure_new
((GCallback)cb_rstto_main_window_fullscreen, window, NULL);
GClosure*leave_fullscreen_closure = g_cclosure_new_swap
((GCallback)gtk_window_unfullscreen, window, NULL);
GClosure*next_image_closure = g_cclosure_new
((GCallback)cb_rstto_main_window_next_image, window, NULL);
GClosure*previous_image_closure = g_cclosure_new
((GCallback)cb_rstto_main_window_previous_image, window, NULL);
@@ -439,12 +440,14 @@ rstto_main_window_init (RsttoMainWindow *window)
accel_group = gtk_ui_manager_get_accel_group (window->priv->ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+gtk_accel_group_connect_by_path (accel_group, "/fullscreen",
toggle_fullscreen_closure);
gtk_accel_group_connect_by_path (accel_group, "/unfullscreen",
leave_fullscreen_closure);
gtk_accel_group_connect_by_path (accel_group, "/next-image",
next_image_closure);
gtk_accel_group_connect_by_path (accel_group, "/previous-image",
previous_image_closure);
gtk_accel_group_connect_by_path (accel_group, "/quit",
quit_closure);
/* Set default accelerators */
+gtk_accel_map_change_entry ("/fullscreen", GDK_F, 0, FALSE);
gtk_accel_map_change_entry ("/unfullscreen", GDK_Escape, 0, FALSE);
gtk_accel_map_change_entry ("/next-image", GDK_Page_Down, 0,
FALSE);
gtk_accel_map_change_entry ("/previous-image", GDK_Page_Up, 0,
FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update TODO file
Updating branch refs/heads/stephan/properties-dialog to 38a2c77a8c5816e7cfcb62bb1b7e10f018cc4d35 (commit) from 5553970f2182cc5831e00de7c4750bbe82578546 (commit) commit 38a2c77a8c5816e7cfcb62bb1b7e10f018cc4d35 Author: Stephan Arts Date: Wed Sep 21 21:20:58 2011 +0200 Update TODO file - Implement a fallback properties-dialog, for when thunar is not available (it happens, bug #4054) - Implement file-monitoring, to track an opened file even when it moves across the filesystem. The thunar-properties dialog allows renaming of the files, using that dialog makes ristretto lose track of an opened file at runtime. TODO |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index e69de29..ab94e3a 100644 --- a/TODO +++ b/TODO @@ -0,0 +1,7 @@ + - Implement a fallback properties-dialog, for when thunar is not available + (it happens, bug #4054) + + - Implement file-monitoring, to track an opened file even when it moves + across the filesystem. The thunar-properties dialog allows renaming + of the files, using that dialog makes ristretto lose track of an + opened file at runtime. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add properties-dialog d-bus interface to thunar again.
Updating branch refs/heads/stephan/properties-dialog
to 5553970f2182cc5831e00de7c4750bbe82578546 (commit)
from c8fbb5a46307dcfe7e4ffd8f69cdee18864c2b2f (commit)
commit 5553970f2182cc5831e00de7c4750bbe82578546
Author: Stephan Arts
Date: Wed Sep 21 21:09:13 2011 +0200
Add properties-dialog d-bus interface to thunar again.
src/main_window.c | 48
src/main_window_ui.xml |1 +
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index ebca286..99b54dc 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -27,6 +27,8 @@
#include
#include
+#include
+
#include
#include "settings.h"
@@ -62,6 +64,9 @@ struct _RsttoMainWindowPriv
gbooleantoolbar_visible;
} props;
+DBusGConnection *connection;
+DBusGProxy *filemanager_proxy;
+
guint show_fs_toolbar_timeout_id;
gint window_save_geometry_timer_id;
gint open_image_timer_id;
@@ -189,6 +194,8 @@ cb_rstto_main_window_open_folder (GtkWidget *widget,
RsttoMainWindow *window);
static void
cb_rstto_main_window_open_recent(GtkRecentChooser *chooser, RsttoMainWindow
*window);
static void
+cb_rstto_main_window_properties (GtkWidget *widget, RsttoMainWindow *window);
+static void
cb_rstto_main_window_close (GtkWidget *widget, RsttoMainWindow *window);
static void
cb_rstto_main_window_close_all (GtkWidget *widget, RsttoMainWindow *window);
@@ -272,6 +279,7 @@ static GtkActionEntry action_entries[] =
{ "open", "document-open", N_ ("_Open"), "O", N_ ("Open an image"),
G_CALLBACK (cb_rstto_main_window_open_image), },
{ "open-folder", "folder-open", N_ ("Open _Folder"), NULL, N_ ("Open a
folder"), G_CALLBACK (cb_rstto_main_window_open_folder), },
{ "save-copy", GTK_STOCK_SAVE_AS, N_ ("_Save copy"), "s", N_ ("Save
a copy of the image"), G_CALLBACK (cb_rstto_main_window_save_copy), },
+ { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties"), NULL, N_ ("Show
file properties"), G_CALLBACK (cb_rstto_main_window_properties), },
{ "close", GTK_STOCK_CLOSE, N_ ("_Close"), "W", N_ ("Close this
image"), G_CALLBACK (cb_rstto_main_window_close), },
{ "close-all", NULL, N_ ("_Close All"), NULL, N_ ("Close all images"),
G_CALLBACK (cb_rstto_main_window_close_all), },
{ "quit", GTK_STOCK_QUIT, N_ ("_Quit"), "Q", N_ ("Quit Ristretto"),
G_CALLBACK (cb_rstto_main_window_quit), },
@@ -411,6 +419,19 @@ rstto_main_window_init (RsttoMainWindow *window)
window->priv->recent_manager = gtk_recent_manager_get_default();
window->priv->settings_manager = rstto_settings_new();
+/* D-Bus stuff */
+
+window->priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+if (window->priv->connection)
+{
+window->priv->filemanager_proxy =
+dbus_g_proxy_new_for_name(
+window->priv->connection,
+"org.xfce.FileManager",
+"/org/xfce/FileManager",
+"org.xfce.FileManager");
+}
+
desktop_type = rstto_settings_get_string_property
(window->priv->settings_manager, "desktop-type");
if (desktop_type)
{
@@ -921,6 +942,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/*
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/print"), FALSE);
*/
+gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/properties"), FALSE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/close"), FALSE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/close-all"), FALSE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/edit-menu/delete"), FALSE);
@@ -981,6 +1003,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/*
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/print"), TRUE);
*/
+gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/properties"), TRUE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/close"), TRUE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/close-all"), FALSE);
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/edit-menu/delete"), TRUE);
@@ -1043,6 +1066,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/*
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager,
[Xfce4-commits] Creating branch stephan/properties-dialog
Updating branch refs/heads/stephan/properties-dialog as new branch to 5553970f2182cc5831e00de7c4750bbe82578546 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/stephan/properties-dialog 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 https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-panel-4.8.6
Updating annotated tag refs/tags/xfce4-panel-4.8.6 as new annotated tag to c72513a328988e8383cf20d5974a77f1e7968eb5 (tag) succeeds xfce4-panel-4.8.5 tagged by Nick Schermer on 2011-09-21 21:02 +0200 Alexandr Boltris (1): l10n: Updated Russian (ru) translation to 100% Andres Sanchez (2): l10n: Updated Spanish (Castilian) (es) translation to 94% l10n: Updated Spanish (Castilian) (es) translation to 96% Ardjuna (1): l10n: Updated Indonesian (id) translation to 99% Artem Zolochevskiy (2): l10n: Updated Russian (ru) translation to 100% l10n: Updated Russian (ru) translation to 100% Bauzhan Muftakhidinov (1): l10n: Updated Kazakh (kk) translation to 100% Chipong Luo (1): l10n: Updated Chinese (China) (zh_CN) translation to 100% Cristian Marchi (1): l10n: Updated Italian (it) translation to 100% Jérôme Guelfucci (1): Fix a typo in French translation. Masato Hashimoto (1): l10n: Updated Japanese (ja) translation to 100% Mișu Moldovan (1): l10n: Updated Romanian (ro) translation to 100% Mohd. Nadzrin Sapari (5): l10n: Updated Malay (ms) translation to 16% l10n: Updated Malay (ms) translation to 79% l10n: Updated Malay (ms) translation to 100% l10n: Updated Malay (ms) translation to 100% l10n: Updated Malay (ms) translation to 100% Nick Schermer (11): Post release tag bump. Panel: Wait until the wm is ready on all screens (bug #7161). Directorymenu: Also send the target directory as arg (bug #7745). Libxfce4panel: Always try to return an icon. Panel: Print string in case of an invalid position. Libxfce4panel: Avoid problem if panel is not yet realized. Applicationsmenu: Fix segfault with not-existing menu (bug #7895). Launcher: Don't reconstruct the items on save (bug #7952). Launcher: Fix broken compilation (bug #7966). Systray: Control the thinkness of the frame (bug #7593). Updates for release. Piarres Beobide (1): l10n: Updated Basque (eu) translation to 100% Pjotr Anon (2): l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% Praveen Illa (1): l10n: First update to Indian Telugu translation Rafael Neri (1): l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% Seong-ho Cho (16): l10n: Updated Korean (ko) translation to 15% l10n: Updated Korean (ko) translation to 22% l10n: Updated Korean (ko) translation to 22% l10n: Updated Korean (ko) translation to 29% l10n: Updated Korean (ko) translation to 37% l10n: Updated Korean (ko) translation to 40% l10n: Updated Korean (ko) translation to 83% l10n: Updated Korean (ko) translation to 96% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% l10n: Updated Korean (ko) translation to 100% Sergio Marques (1): l10n: Updated Portuguese (pt) translation to 100% Tomáš Vadina (3): l10n: Updated Slovak (sk) translation to 100% l10n: Updated Slovak (sk) translation to 100% l10n: Updated Slovak (sk) translation to 100% alpertekinalp (1): l10n: Updated Turkish (tr) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/xfce-4.8 to 1f9a1c5a3b3a83f529f32cfbcbd9303a7c9189c0 (commit) from fcf9d7a9885282e2770fe35d4f4037c7f8ed3d4a (commit) commit 1f9a1c5a3b3a83f529f32cfbcbd9303a7c9189c0 Author: Nick Schermer Date: Wed Sep 21 21:02:30 2011 +0200 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index f7e74f4..16a1a27 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,7 +15,7 @@ m4_define([xfce4_panel_version_minor], [8]) m4_define([xfce4_panel_version_micro], [6]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [@REVISION@]) -m4_define([xfce4_panel_version_tag], []) +m4_define([xfce4_panel_version_tag], [git]) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/xfce-4.8 to fcf9d7a9885282e2770fe35d4f4037c7f8ed3d4a (commit) from 9b84b6cd66885c5513357b3ea6497505cbef66b2 (commit) commit fcf9d7a9885282e2770fe35d4f4037c7f8ed3d4a Author: Nick Schermer Date: Wed Sep 21 20:58:45 2011 +0200 Updates for release. NEWS| 14 ++ configure.ac.in |4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4bf6de7..306d65b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +4.8.6 += +- Panel: Wait until the wm is ready on all screens (bug #7161). +- Systray: Control the thinkness of the frame (bug #7593). +- Launcher: Fix broken compilation (bug #7966). +- Launcher: Don't reconstruct the items on save (bug #7952). +- Applicationsmenu: Fix segfault with not-existing menu (bug #7895). +- Libxfce4panel: Avoid problem if panel is not yet realized. +- Panel: Print string in case of an invalid position. +- Libxfce4panel: Always try to return an icon. +- Directorymenu: Also send the target directory as arg (bug #7745). +- Translation updates (it, tr, nl, sk, pt_BR, te, zh_CN, pt, ru, ko, + ja, ro, fr, kk, ms, es, id, eu). + 4.8.5 = - Tasklist: Avoid unneeded dnd actions. diff --git a/configure.ac.in b/configure.ac.in index aca981b..f7e74f4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,10 +12,10 @@ m4_define([libxfce4panel_verinfo], [3:0:0]) dnl current:revision:age m4_define([libxfce4panel_version_api], [1.0]) m4_define([xfce4_panel_version_major], [4]) m4_define([xfce4_panel_version_minor], [8]) -m4_define([xfce4_panel_version_micro], [5]) +m4_define([xfce4_panel_version_micro], [6]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [@REVISION@]) -m4_define([xfce4_panel_version_tag], [git]) +m4_define([xfce4_panel_version_tag], []) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Post release tag bump.
Updating branch refs/heads/master to 089c512a02ecc85ba6be9a3583c70b768148504c (commit) from 2ef858a3abfe04454de0432cc292f2ad001f18e8 (commit) commit 089c512a02ecc85ba6be9a3583c70b768148504c Author: Nick Schermer Date: Wed Sep 21 20:46:34 2011 +0200 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 99b9624..4ea3179 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,7 +10,7 @@ m4_define([xfce4_appfinder_version_minor], [9]) m4_define([xfce4_appfinder_version_micro], [0]) m4_define([xfce4_appfinder_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_appfinder_version_build], [@REVISION@]) -m4_define([xfce4_appfinder_version_tag], []) +m4_define([xfce4_appfinder_version_tag], [git]) m4_define([xfce4_appfinder_version], [xfce4_appfinder_version_major().xfce4_appfinder_version_minor().xfce4_appfinder_version_micro()ifelse(xfce4_appfinder_version_nano(), [], [], [.xfce4_appfinder_version_nano()])ifelse(xfce4_appfinder_version_tag(), [git], [xfce4_appfinder_version_tag()-xfce4_appfinder_version_build()], [xfce4_appfinder_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-appfinder-4.9.0
Updating annotated tag refs/tags/xfce4-appfinder-4.9.0 as new annotated tag to 2f8c3398516367a8f53624ad1c874c29f6b7ba1a (tag) succeeds xfce4-appfinder-4.8.0 tagged by Nick Schermer on 2011-09-21 20:45 +0200 Alexandr Boltris (1): l10n: Updated Russian (ru) translation to 100% Alper Tekinalp (2): l10n: Updated Turkish (tr) translation to 59% l10n: Updated Turkish (tr) translation to 81% Andres Sanchez (2): l10n: Updated Spanish (Castilian) (es) translation to 95% l10n: Updated Spanish (Castilian) (es) translation to 100% Anthony Jorion (1): l10n: Updated French (fr) translation to 90% Artem Zolochevskiy (1): l10n: Updated Russian (ru) translation to 100% Bauzhan Muftakhidinov (1): l10n: Updated Kazakh (kk) translation to 43% Cheng-Chia Tseng (1): l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% Cristian Marchi (1): l10n: Updated Italian (it) translation to 100% Fabian Nowak (1): l10n: Updated German (de) translation to 100% Gonzalo Lagos (1): l10n: Updated Spanish (Castilian) (es) translation to 100% Henrique P. Machado (1): l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% Ivica Kolić (2): l10n: Updated Croatian (hr) translation to 72% l10n: Updated Croatian (hr) translation to 72% Jannis Pohlmann (1): Post-release version bump. Nick Schermer (34): Initial work on xfce4-appfinder and xfrun4 merge. Fix initial item visibility. Fix a bunch of todo items. Make a start with dbus, model sharing and settings. Share category data and use pointers for category comparison. Daemonize the process if dbus service. Use --disable-server to avoid dbus and daemonize. Fix selection of category in sidepane. Full support for menu reloading. Remember last selected category. Drop optional filename support. Take model reference once the first window is destroyed. Load data once the window is constructed. Properly handle item visibility. Store item visibility. Idle entry-changed filtering. Add more icon loading fallbacks. Collect items directly fron the GarconMenuItemPool. Use custom error macros. Fix command loading. Avoid unneeded category refilter. Clear command history menu item. Drop the menu from previous commit. Some cleanups. Update po files. Add properties dialog with basic settings. Initial work on custom actions. Fix default item loading. Add action item editing. Update translations. Fix unref of NULL object. Invert expand mode from command line. Rebuild po files. Updates for release. Per Kongstad (1): l10n: Updated Danish (da) translation to 100% Piarres Beobide (2): l10n: Updated Basque (eu) translation to 95% l10n: Updated Basque (eu) translation to 100% Pjotr Anon (8): l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% l10n: Updated Dutch (Flemish) (nl) translation to 100% Praveen Illa (2): l10n: Completed Translation l10n: Updated Telugu (te) translation to 77% Seong-ho Cho (1): l10n: Updated Korean (ko) translation to 100% Sérgio Cipolla (2): l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% Tomáš Vadina (1): l10n: Updated Slovak (sk) translation to 100% Vinh Nguyen (2): l10n: Updates to Vietnamese translation l10n: Updated Vietnamese (vi) translation to 95% Yarema aka Knedlyk (1): l10n: Updated Ukrainian (uk) translation to 100% afsanchez93 (1): l10n: Updated Spanish (Castilian) (es) translation to 77% كريم أولاد الشلحة (1): l10n: Updated Arabic (ar) translation to 100% 玉堂 白鹤 (3): l10n: Updated Chinese (China) (zh_CN) translation to 86% l10n: Updated Chinese (China) (zh_CN) translation to 95% l10n: Updated Chinese (China) (zh_CN) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updates for release.
Updating branch refs/heads/master to 2ef858a3abfe04454de0432cc292f2ad001f18e8 (commit) from 7488f9078f8ce3aa8a8da67de0ff7e2ebb3a8fb8 (commit) commit 2ef858a3abfe04454de0432cc292f2ad001f18e8 Author: Nick Schermer Date: Wed Sep 21 20:44:26 2011 +0200 Updates for release. NEWS|6 ++ configure.ac.in |2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 5e59172..d59cae1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +4.9.0 += +- Rewrite of the the application finder to merge the functionality + of the appfinder as we know it in 4.8 and xfrun4 (start with + --collapsed). + 4.8.0 = - Translation updates: French, Romanian. diff --git a/configure.ac.in b/configure.ac.in index 4ea3179..99b9624 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,7 +10,7 @@ m4_define([xfce4_appfinder_version_minor], [9]) m4_define([xfce4_appfinder_version_micro], [0]) m4_define([xfce4_appfinder_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_appfinder_version_build], [@REVISION@]) -m4_define([xfce4_appfinder_version_tag], [git]) +m4_define([xfce4_appfinder_version_tag], []) m4_define([xfce4_appfinder_version], [xfce4_appfinder_version_major().xfce4_appfinder_version_minor().xfce4_appfinder_version_micro()ifelse(xfce4_appfinder_version_nano(), [], [], [.xfce4_appfinder_version_nano()])ifelse(xfce4_appfinder_version_tag(), [git], [xfce4_appfinder_version_tag()-xfce4_appfinder_version_build()], [xfce4_appfinder_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Invert expand mode from command line.
Updating branch refs/heads/master
to ee613af51874b90888b0faa396ba3abe87cb993c (commit)
from 1614a841a7ee904142f8f1a8781d5e8097a24d55 (commit)
commit ee613af51874b90888b0faa396ba3abe87cb993c
Author: Nick Schermer
Date: Wed Sep 21 20:38:52 2011 +0200
Invert expand mode from command line.
data/xfce4-appfinder.desktop.in |2 +-
data/xfce4-run.desktop.in |2 +-
src/main.c |9 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/data/xfce4-appfinder.desktop.in b/data/xfce4-appfinder.desktop.in
index 2b4bec2..41f4cf5 100644
--- a/data/xfce4-appfinder.desktop.in
+++ b/data/xfce4-appfinder.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Version=1.0
-Exec=xfce4-appfinder -x
+Exec=xfce4-appfinder
Icon=gtk-find
StartupNotify=true
Terminal=false
diff --git a/data/xfce4-run.desktop.in b/data/xfce4-run.desktop.in
index 72b5012..613f8c5 100644
--- a/data/xfce4-run.desktop.in
+++ b/data/xfce4-run.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Version=1.0
Type=Application
-Exec=xfce4-appfinder
+Exec=xfce4-appfinder -c
Icon=gtk-execute
StartupNotify=true
Terminal=false
diff --git a/src/main.c b/src/main.c
index e4897c1..cfd8cc5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,7 +54,7 @@
-static gbooleanopt_expanded = FALSE;
+static gbooleanopt_collapsed = FALSE;
static gbooleanopt_version = FALSE;
static gbooleanopt_replace = FALSE;
static gbooleanopt_quit = FALSE;
@@ -67,7 +67,7 @@ static XfceAppfinderModel *model_cache = NULL;
static GOptionEntry option_entries[] =
{
- { "expanded", 'x', 0, G_OPTION_ARG_NONE, &opt_expanded, N_("Start in
expanded mode"), NULL },
+ { "collapsed", 'c', 0, G_OPTION_ARG_NONE, &opt_collapsed, N_("Start in
collapsed mode"), NULL },
{ "version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, N_("Print version
information and exit"), NULL },
{ "replace", 'r', 0, G_OPTION_ARG_NONE, &opt_replace, N_("Replace the
existing service"), NULL },
{ "quit", 'q', 0, G_OPTION_ARG_NONE, &opt_quit, N_("Quit all instances"),
NULL },
@@ -190,6 +190,7 @@ appfinder_dbus_open_window (DBusConnection *dbus_connection,
DBusErrorderror;
DBusMessage *method, *result;
+ gboolean expanded = !opt_collapsed;
method = dbus_message_new_method_call (APPFINDER_DBUS_SERVICE,
APPFINDER_DBUS_PATH,
@@ -200,7 +201,7 @@ appfinder_dbus_open_window (DBusConnection *dbus_connection,
startup_id = "";
dbus_message_append_args (method,
-DBUS_TYPE_BOOLEAN, &opt_expanded,
+DBUS_TYPE_BOOLEAN, &expanded,
DBUS_TYPE_STRING, &startup_id,
DBUS_TYPE_INVALID);
@@ -458,7 +459,7 @@ main (gint argc, gchar **argv)
}
/* create initial window */
- appfinder_window_new (NULL, opt_expanded);
+ appfinder_window_new (NULL, !opt_collapsed);
APPFINDER_DEBUG ("enter mainloop");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/xfrun4-merge
Deleting branch refs/heads/nick/xfrun4-merge ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix unref of NULL object.
Updating branch refs/heads/master
to 1614a841a7ee904142f8f1a8781d5e8097a24d55 (commit)
from a32bcee4fea4acb29aeba734fd79de82f9ea21fd (commit)
commit 1614a841a7ee904142f8f1a8781d5e8097a24d55
Author: Nick Schermer
Date: Wed Sep 21 20:23:59 2011 +0200
Fix unref of NULL object.
src/appfinder-window.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/appfinder-window.c b/src/appfinder-window.c
index c2135a5..da0b6bf 100644
--- a/src/appfinder-window.c
+++ b/src/appfinder-window.c
@@ -379,7 +379,9 @@ xfce_appfinder_window_finalize (GObject *object)
g_object_unref (G_OBJECT (window->category_model));
g_object_unref (G_OBJECT (window->completion));
g_object_unref (G_OBJECT (window->icon_find));
- g_object_unref (G_OBJECT (window->actions));
+
+ if (window->actions != NULL)
+g_object_unref (G_OBJECT (window->actions));
if (window->filter_category != NULL)
g_object_unref (G_OBJECT (window->filter_category));
@@ -842,7 +844,7 @@ xfce_appfinder_window_execute (XfceAppfinderWindow *window)
gtk_tree_model_filter_convert_iter_to_child_iter
(GTK_TREE_MODEL_FILTER (model), &orig, &iter);
result = xfce_appfinder_model_execute (window->model, &orig, screen,
®ular_command, &error);
- if (!result && regular_command)
+ if (!result && regular_command)
{
gtk_tree_model_get (model, &iter,
XFCE_APPFINDER_MODEL_COLUMN_COMMAND, &cmd, -1);
result = xfce_appfinder_window_execute_command (cmd, screen,
window, &error);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove deprecated call to gdk_pixbuf_unref
Updating branch refs/heads/master to c8fbb5a46307dcfe7e4ffd8f69cdee18864c2b2f (commit) from 3c438c686424247ba155ac4326fd36f556f75523 (commit) commit c8fbb5a46307dcfe7e4ffd8f69cdee18864c2b2f Author: Stephan Arts Date: Tue Sep 20 21:58:46 2011 +0200 Remove deprecated call to gdk_pixbuf_unref src/image_viewer.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index ed56f5c..3670f6d 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -809,7 +809,7 @@ rstto_image_viewer_paint_selection (RsttoImageViewer *viewer, GdkDrawable *drawa GDK_RGB_DITHER_NONE, 0, 0); -gdk_pixbuf_unref(sub); +g_object_unref(sub); sub = NULL; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add new files to POTFILES.in.
Updating branch refs/heads/master to a46d5c24da5971d2049b8386f599a0c6e126cf70 (commit) from 28868acca8df5765b031c701de123640a6d9290f (commit) commit a46d5c24da5971d2049b8386f599a0c6e126cf70 Author: Nick Schermer Date: Sat Jul 9 16:39:07 2011 +0200 Add new files to POTFILES.in. po/POTFILES.in |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 9ebd398..8ad7d7f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -23,3 +23,11 @@ libxfce4kbd-private/xfce-shortcuts-provider.c # glade/libxfce4ui-glade.c glade/libxfce4ui.xml.in + +# +# Xfce4-about +# +xfce4-about/main.c +xfce4-about/contributors.h +xfce4-about/xfce4-about.desktop.in +xfce4-about/xfce4-about-dialog.glade ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add xflock4 from xfce-utils.
Updating branch refs/heads/master
to 87cbe08c0dbbbd6937328d47bdc86bc906cc29c4 (commit)
from 7bfa434dd7517fd6791f6fa43bd9b46224809162 (commit)
commit 87cbe08c0dbbbd6937328d47bdc86bc906cc29c4
Author: Nick Schermer
Date: Sun Jul 24 21:45:15 2011 +0200
Add xflock4 from xfce-utils.
scripts/Makefile.am |3 ++-
scripts/xflock4 | 31 +++
2 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0ad26d5..b1b4b6e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,5 +1,6 @@
bin_SCRIPTS= \
- startxfce4
+ startxfce4 \
+ xflock4
# cannot be set from configure, because ${prefix} is not expanded
edit = sed \
diff --git a/scripts/xflock4 b/scripts/xflock4
new file mode 100644
index 000..fcf3323
--- /dev/null
+++ b/scripts/xflock4
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# xfce4
+#
+# Copyright (C) 1999, 2003 Olivier Fourdan (four...@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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
+xscreensaver-command -lock
+elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
+gnome-screensaver-command --lock
+elif test x"`which slock 2>/dev/null`" != x""; then
+ slock
+else
+xlock $*
+fi
+exit 0
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add xfce.desktop session file from xfce-utils.
Updating branch refs/heads/master to 7396986fda4e870afa007b3fbc23431c6ca44a17 (commit) from 7a898cea0afdc3baeffca8c848366658f90e3e67 (commit) commit 7396986fda4e870afa007b3fbc23431c6ca44a17 Author: Nick Schermer Date: Sat Jul 9 16:42:19 2011 +0200 Add xfce.desktop session file from xfce-utils. Makefile.am | 10 -- po/POTFILES.in |1 + xfce.desktop.in |7 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2401d3a..01f3542 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,18 +16,24 @@ if HAVE_LIBXFCE4PANEL panel_plugin_dir = panel-plugin endif +desktopdir = $(XSESSION_PREFIX)/share/xsessions +desktop_in_files = xfce.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ BUGS\ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ xfce4-session.spec \ - $(config_DATA) + $(config_DATA) \ + $(desktop_in_files) DISTCLEANFILES = \ intltool-extract\ intltool-merge \ - intltool-update + intltool-update \ + $(desktop_DATA) html: (cd doc && $(MAKE) $(AM_MAKEFLAGS) html) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8353c52..5dce11d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. +xfce.desktop.in engines/balou/balou-theme.c engines/balou/config.c engines/mice/mice.c diff --git a/xfce.desktop.in b/xfce.desktop.in new file mode 100644 index 000..f4d6926 --- /dev/null +++ b/xfce.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +_Name=Xfce Session +_Comment=Use this session to run Xfce as your desktop environment +Exec=startxfce4 +Icon= +Type=Application ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add Xft.xrdb from xfce-utils.
Updating branch refs/heads/master to 7bfa434dd7517fd6791f6fa43bd9b46224809162 (commit) from 47b0ba14d847c6c1e727f0aff479795a2ed110a5 (commit) commit 7bfa434dd7517fd6791f6fa43bd9b46224809162 Author: Nick Schermer Date: Sat Jul 9 16:57:39 2011 +0200 Add Xft.xrdb from xfce-utils. scripts/Makefile.am |8 +--- scripts/Xft.xrdb|7 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 091094a..0ad26d5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -19,12 +19,14 @@ xinitrc: Makefile $(srcdir)/xinitrc.in mv xinitrc.tmp xinitrc conffilesdir=@sysconfdir@/xdg/xfce4 -conffiles_DATA=\ - xinitrc +conffiles_DATA = \ + xinitrc \ + Xft.xrdb EXTRA_DIST = \ startxfce4.in \ - xinitrc.in + xinitrc.in \ + Xft.xrdb DISTCLEANFILES = \ startxfce4 \ diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb new file mode 100644 index 000..cd26513 --- /dev/null +++ b/scripts/Xft.xrdb @@ -0,0 +1,7 @@ +! Those are fallback settings, use the ui plugin to change it +! or add your overrides to ~/.Xresources +! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull +! Xft hinting: 1/0 + +Xft.hinting: 1 +Xft.hintstyle: hintmedium ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump version.
Updating branch refs/heads/master to 47b0ba14d847c6c1e727f0aff479795a2ed110a5 (commit) from 6d37293024adbbeb205246d1377b5420e6c6f485 (commit) commit 47b0ba14d847c6c1e727f0aff479795a2ed110a5 Author: Nick Schermer Date: Sat Jul 9 16:54:03 2011 +0200 Bump version. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 6cb3529..74ce270 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,7 +7,7 @@ dnl dnl Version information m4_define([xfsm_version_major], [4]) -m4_define([xfsm_version_minor], [8]) +m4_define([xfsm_version_minor], [9]) m4_define([xfsm_version_micro], [0]) m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version m4_define([xfsm_version_build], [@REVISION@]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add startxfce4 and xinit from xfce-utils.
Updating branch refs/heads/master
to 6d37293024adbbeb205246d1377b5420e6c6f485 (commit)
from 7396986fda4e870afa007b3fbc23431c6ca44a17 (commit)
commit 6d37293024adbbeb205246d1377b5420e6c6f485
Author: Nick Schermer
Date: Sat Jul 9 16:51:24 2011 +0200
Add startxfce4 and xinit from xfce-utils.
Makefile.am |2 +
configure.in.in |2 +
scripts/Makefile.am | 31 +
scripts/startxfce4.in | 94 +++
scripts/xinitrc.in.in | 309 +
5 files changed, 438 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 01f3542..a7334e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS =
\
icons \
po \
settings\
+ scripts \
xfce4-session \
xfce4-session-logout\
xfsm-shutdown-helper\
@@ -19,6 +20,7 @@ endif
desktopdir = $(XSESSION_PREFIX)/share/xsessions
desktop_in_files = xfce.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
BUGS\
diff --git a/configure.in.in b/configure.in.in
index 3e52b52..6cb3529 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -274,6 +274,8 @@ libxfsm/xfce4-session-2.0.pc
panel-plugin/Makefile
po/Makefile.in
settings/Makefile
+scripts/Makefile
+scripts/xinitrc.in
xfce4-session/Makefile
xfce4-session-logout/Makefile
xfsm-shutdown-helper/Makefile
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
new file mode 100644
index 000..091094a
--- /dev/null
+++ b/scripts/Makefile.am
@@ -0,0 +1,31 @@
+bin_SCRIPTS= \
+ startxfce4
+
+# cannot be set from configure, because ${prefix} is not expanded
+edit = sed \
+ -e "s,@_datadir_\@,$(datadir),g" \
+ -e "s,@_libdir_\@,$(libdir),g" \
+ -e "s,@_docdir_\@,$$(dirname $(docdir)),g" \
+ -e "s,@_sysconfdir_\@,$(sysconfdir),g"
+
+startxfce4: Makefile $(srcdir)/startxfce4.in
+ rm -f startxfce4 startxfce4.tmp
+ $(edit) $(srcdir)/startxfce4.in >startxfce4.tmp
+ mv startxfce4.tmp startxfce4
+
+xinitrc: Makefile $(srcdir)/xinitrc.in
+ rm -f xinitrc xinitrc.tmp
+ $(edit) $(srcdir)/xinitrc.in >xinitrc.tmp
+ mv xinitrc.tmp xinitrc
+
+conffilesdir=@sysconfdir@/xdg/xfce4
+conffiles_DATA=\
+ xinitrc
+
+EXTRA_DIST = \
+ startxfce4.in \
+ xinitrc.in
+
+DISTCLEANFILES = \
+ startxfce4 \
+ xinitrc
diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
new file mode 100644
index 000..7a871d2
--- /dev/null
+++ b/scripts/startxfce4.in
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# xfce4
+#
+# Copyright (C) 1996-2003 Olivier Fourdan (four...@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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+if test "x$XDG_CONFIG_HOME" = "x"
+then
+ BASEDIR="$HOME/.config/xfce4/"
+else
+ BASEDIR="$XDG_CONFIG_HOME/xfce4"
+fi
+
+if test "x$XDG_DATA_DIRS" = "x"
+then
+ if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" =
"x/usr/share"; then
+XDG_DATA_DIRS="/usr/local/share:/usr/share"
+ else
+XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
+ fi
+else
+ XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
+fi
+export XDG_DATA_DIRS
+
+if test "x$XDG_CONFIG_DIRS" = "x"
+then
+ if test "x@_sysconfdir_@" = "x/etc"; then
+XDG_CONFIG_DIRS="/etc/xdg"
+ else
+XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
+ fi
+else
+ XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
+fi
+export XDG_CONFIG_DIRS
+
+if test "x$DISPLAY" = "x"
+then
+ echo "$0: Starting X server"
+ prog=xinit
+else
+ echo "$0: X server already running on display $DISPLAY"
+ prog=/bin/sh
+fi
+
+if test ! "x$*" = "x"
+then
+ OPT=$*
+ if test "x${OPT#*--}" = "x${OPT}"
+ then
+CLIENTRC=${OPT}
+ else
+SERVERRC
[Xfce4-commits] Add xfhelp scripts.
Updating branch refs/heads/master
to 8a909006056efa380ead1f2746f81f9f56d97eff (commit)
from 26070f28f3ad7d4f9c9b44e0e319235f5259bd2e (commit)
commit 8a909006056efa380ead1f2746f81f9f56d97eff
Author: Nick Schermer
Date: Wed Sep 21 18:30:48 2011 +0200
Add xfhelp scripts.
Makefile.am| 25 +-
xfhelp4.desktop.in | 11 ++
xfhelp4.in | 55
3 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e44b43d..fbe5b94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
SUBDIRS = \
xfce-user-guide
+bin_SCRIPTS= \
+ xfhelp4
+
distclean-local:
rm -rf *.spec *.cache *~
@@ -18,18 +21,36 @@ ChangeLog: Makefile
dist-hook: ChangeLog
+desktopdir = $(datadir)/applications
+desktop_in_files = xfhelp4.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+edit = sed \
+ -e "s,@_datadir_\@,$(datadir),g" \
+ -e "s,@_libdir_\@,$(libdir),g" \
+ -e "s,@_docdir_\@,$$(dirname $(docdir)),g" \
+ -e "s,@_sysconfdir_\@,$(sysconfdir),g"
+
+xfhelp4: Makefile $(srcdir)/xfhelp4.in
+ rm -f xfhelp4 xfhelp4.tmp
+ $(edit) $(srcdir)/xfhelp4.in >xfhelp4.tmp
+ mv xfhelp4.tmp xfhelp4
+
EXTRA_DIST = \
$(desktop_in_files) \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in
+ intltool-update.in \
+ xfhelp4.in
DISTCLEANFILES = \
$(desktop_DATA) \
intltool-extract \
intltool-merge \
intltool-update \
- intltool-update-tmp
+ intltool-update-tmp \
+ xfhelp4
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gen-doc
diff --git a/xfhelp4.desktop.in b/xfhelp4.desktop.in
new file mode 100644
index 000..784caac
--- /dev/null
+++ b/xfhelp4.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=xfhelp4
+Icon=help-contents
+StartupNotify=false
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+_Name=Help
+_Comment=Help using Xfce
diff --git a/xfhelp4.in b/xfhelp4.in
new file mode 100644
index 000..8f0e7fc
--- /dev/null
+++ b/xfhelp4.in
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# xfce
+#
+# Copyright (C) 1999 Olivier Fourdan (four...@xfce.org)
+# Copyright (C) 2003 Jasper Huijsmans (jas...@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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+HELP_DIR="@_docdir_@"
+
+if [ ! x"$1" = x"" ]; then
+MODULE="${1%.html}"
+else
+MODULE="xfce-utils"
+fi
+
+# Check for translated documentation
+if [ -n "$LC_ALL" ] ; then
+ LC=$LC_ALL
+elif [ -n "$LANG" ] ; then
+ LC=$LANG
+else
+ LC="C"
+fi
+
+LC_CLEAN="`echo $LC | sed 's/\(..\)_.*/\1/'`"
+
+if [ -r "$HELP_DIR/$MODULE/html/$LC/index.html" ]
+then
+ URL="$HELP_DIR/$MODULE/html/$LC/index.html"
+elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html" ]
+then
+ URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html"
+elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ]
+then
+ URL="$HELP_DIR/$MODULE/html/C/index.html"
+else
+ URL="$HELP_DIR/xfce-utils/html/C/index.html"
+fi
+
+exo-open --launch WebBrowser $URL
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 96%
Updating branch refs/heads/master to c52e01de99d8475a96ac5ac65c35801b12c8aec5 (commit) from d6c5ea1b400d7f981ea6096ae0776aa3aaa057e6 (commit) commit c52e01de99d8475a96ac5ac65c35801b12c8aec5 Author: Bauzhan Muftakhidinov Date: Wed Sep 21 14:18:14 2011 +0200 l10n: Updated Kazakh (kk) translation to 96% New status: 285 messages complete with 5 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 46 -- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/po/kk.po b/po/kk.po index 2a88cd9..1294024 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-25 10:13+\n" +"POT-Creation-Date: 2011-09-21 10:14+\n" "PO-Revision-Date: 2010-08-03 10:14+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -637,7 +637,7 @@ msgid "Shell Scripts" msgstr "Қоршам скриптері" #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:1 -msgid "Appli_cation Shortcuts" +msgid "A_pplication Shortcuts" msgstr "Қолда_нбалар жарлықтары" #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2 @@ -683,61 +683,61 @@ msgid "Repeat _speed:" msgstr "Қайталау жы_лдамдығы:" #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 +msgid "Reset to _Defaults" +msgstr "Баста_пқы түріне келтіру" + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid "Select keyboard layout and variant" msgstr "Пернетақта жаймасы мен нұсқасын таңдау" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 msgid "Show _blinking" msgstr "Жыпылықтауды көр_сету" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15 msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server" msgstr "Пернетақта жаймасы осы баптаулармен не X серверімен басқарылуын анықтайды" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16 msgid "Specify whether or not the text cursor blinks" msgstr "Мәтін курсоры жыпылықтауын анықтайды" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17 msgid "The delay, in milliseconds, between successive blinks of the cursor" msgstr "Курсор екі жыпылықтауының аралығы, мсек" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18 msgid "The rate at which keystrokes are generated while a key is pressed" msgstr "Перне басулы тұрған кезде туғызылатын басылымдар жиілігі" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19 msgid "The time, in milliseconds, before a pressed key begins repeating" msgstr "Басылған перне қайталана бастауға дейінгі өтетін уақыт аралығы, мсек" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20 msgid "Typing Settings" msgstr "Теру баптаулары" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21 msgid "Use this area to _test the settings above:" msgstr "Жоғарыдағы б_аптауларды сынау өрісі:" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22 msgid "When selected, pressing and holding down a key emits the same character over and over again" msgstr "Таңдаулы тұрса, пернені басып, ұстау оның таңбасын қайта-қайта енгізуді туғызады" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23 msgid "_Enable key repeat" msgstr "_Пернелер қайталауын іске қосу" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24 msgid "_Layout" msgstr "Жа_йма" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25 msgid "_Repeat delay:" msgstr "Қайталау бө_геуі:" -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25 -msgid "_Reset to Defaults" -msgstr "_Бастапқы түріне келтіру" - #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26 msgid "_Use system defaults" msgstr "_Жүйелік негізгі түріне келтіру" @@ -912,7 +912,6 @@ msgid "Reset to De_faults" msgstr "Баст_апқы түріне келтіру" #: ../dialogs/mouse-settings/mouse-dialog.glade.h:23 -#, fuzzy msgid "Reverse scroll d_irection" msgstr "Ты_шқан дөңгелегін айналдыруды терістеу" @@ -1260,13 +1259,13 @@ msgstr "Жұмыс үстеліңізді баптаңыз" msgid "_Overview" msgstr "Алд_ын-ала қарау" -#: ../xfce4-settings-manager/xf
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 43%
Updating branch refs/heads/master to a32bcee4fea4acb29aeba734fd79de82f9ea21fd (commit) from f02948328b02a5008e2813432f78519374b34257 (commit) commit a32bcee4fea4acb29aeba734fd79de82f9ea21fd Author: Bauzhan Muftakhidinov Date: Wed Sep 21 14:16:05 2011 +0200 l10n: Updated Kazakh (kk) translation to 43% New status: 17 messages complete with 4 fuzzies and 18 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 43 --- 1 files changed, 20 insertions(+), 23 deletions(-) diff --git a/po/kk.po b/po/kk.po index 07b5127..ed15820 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,33 +2,33 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-20 21:55+0200\n" +"POT-Creation-Date: 2011-09-21 10:12+\n" "PO-Revision-Date: 2010-02-20 00:40+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" -"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" "Plural-Forms: nplurals=1; plural=0\n" #: ../src/appfinder-category-model.c:108 #, fuzzy msgid "All Applications" -msgstr "Қолданбаларды табушы" +msgstr "Барлық қолданбалар" #: ../src/appfinder-model.c:422 msgid "Name" -msgstr "" +msgstr "Аты" #: ../src/appfinder-model.c:423 msgid "Command" -msgstr "" +msgstr "Команда" #: ../src/appfinder-model.c:424 msgid "Categories" @@ -36,16 +36,16 @@ msgstr "Санаттар" #: ../src/appfinder-model.c:425 msgid "Filename" -msgstr "" +msgstr "Файл аты" #: ../src/appfinder-model.c:1317 #, fuzzy msgid "Application has no command" -msgstr "Қолданбаларды табушы" +msgstr "Қолданбада команда жоқ" #: ../src/appfinder-model.c:1634 msgid "Commands History" -msgstr "" +msgstr "Командалар тарихы" #: ../src/appfinder-window.c:183 ../src/main.c:343 #: ../src/appfinder-preferences.glade.h:3 @@ -55,28 +55,28 @@ msgstr "Қолданбаларды табушы" #: ../src/appfinder-window.c:224 msgid "Toggle view mode" -msgstr "" +msgstr "Қарау түрін ауыстыру" #: ../src/main.c:70 msgid "Start in expanded mode" -msgstr "" +msgstr "Кеңейтілген түрде іске қосылу" #: ../src/main.c:71 #, fuzzy msgid "Print version information and exit" -msgstr "Нұсқа ақпараты" +msgstr "Нұсқа ақпаратын шығару мен шығу" #: ../src/main.c:72 msgid "Replace the existing service" -msgstr "" +msgstr "Бар қызметті ауыстыру" #: ../src/main.c:73 msgid "Quit all instances" -msgstr "" +msgstr "Барлық нұсқалардың жұмысын аяқтау" #: ../src/main.c:74 msgid "Do not try to use or become a D-Bus service" -msgstr "" +msgstr "D-Bus қызметін көру не болуды болдырмау" #. close all windows and quit #: ../src/main.c:159 @@ -90,7 +90,7 @@ msgstr "" #: ../src/main.c:417 #, fuzzy, c-format msgid "Type \"%s --help\" for usage." -msgstr "Қолдану туралы ақпаратты оқу үшін '%s --help' енгізіңіз." +msgstr "Қолдану ақпараты үшін \"%s --help\" енгізіңіз." #: ../src/main.c:428 msgid "The Xfce development team. All rights reserved." @@ -103,7 +103,7 @@ msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>." #: ../src/appfinder-preferences.glade.h:1 msgid "Add a new custom action." -msgstr "" +msgstr "Жаңа таңдауыңызша әрекетті қосу." #: ../src/appfinder-preferences.glade.h:2 msgid "Always c_enter the window" @@ -123,7 +123,7 @@ msgstr "" #: ../src/appfinder-preferences.glade.h:7 msgid "Co_mmand:" -msgstr "" +msgstr "Ко_манда:" #: ../src/appfinder-preferences.glade.h:8 msgid "Custom _Actions" @@ -131,14 +131,11 @@ msgstr "" #: ../src/appfinder-preferences.glade.h:9 msgid "History" -msgstr "" +msgstr "Тарих" #: ../src/appfinder-preferences.glade.h:11 #, no-c-format -msgid "" -"If the type is set to prefix, %s will be replaced with the string after the " -"pattern, %S with the complete entry text. For regular expressions you can " -"use \\0 and \\." +msgid "If the type is set to prefix, %s will be replaced with the string after the pattern, %S with the complete entry text. For regular expressions you can use \\0 and \\." msgstr "" #: ../src/appfinder-preferences.glade.h:12 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
