[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 6168e7c44dd9184590e8ca5f3b6a518bce59da15 (commit) from 9d97afcc71e55e5c1363a3ca126eab96aac4da24 (commit) commit 6168e7c44dd9184590e8ca5f3b6a518bce59da15 Author: Cristian Marchi Date: Sat Mar 31 08:39:19 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 387 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 304 +++--- 1 files changed, 171 insertions(+), 133 deletions(-) diff --git a/po/it.po b/po/it.po index 5a14697..1b42904 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-01 10:00+\n" +"POT-Creation-Date: 2012-03-31 03:21+\n" "PO-Revision-Date: 2011-10-29 12:18+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian Translation Team \n" @@ -47,41 +47,20 @@ msgid "Customize the panel" msgstr "Personalizzazione del pannello" #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:29 ../panel/panel-window.c:2327 +#: ../panel/panel-preferences-dialog.glade.h:29 ../panel/panel-window.c:2353 #: ../migrate/main.c:117 msgid "Panel" msgstr "Pannello" -#: ../common/panel-utils.c:157 -msgid "_Read Online" -msgstr "_Leggi online" - -#: ../common/panel-utils.c:158 -msgid "" -"You can read the user manual online. This manual may however not exactly " -"match your panel version." -msgstr "" -"È possibile leggere il manuale utente online. Questo manuale potrebbe " -"comunque non corrispondere alla propria versione del pannello." - -#: ../common/panel-utils.c:160 -msgid "The user manual is not installed on your computer" -msgstr "Il manuale utente non è installato su questo computer" - -#. display an error message to the user -#: ../common/panel-utils.c:175 -msgid "Failed to open the documentation browser" -msgstr "Impossibile aprire il browser della documentazione" - #. I18N: %s is the name of the plugin #: ../libxfce4panel/xfce-panel-plugin.c:1037 -#: ../panel/panel-preferences-dialog.c:1078 +#: ../panel/panel-preferences-dialog.c:1094 #, c-format msgid "Are you sure that you want to remove \"%s\"?" msgstr "Rimuovere davvero \"%s\"?" #: ../libxfce4panel/xfce-panel-plugin.c:1042 -#: ../panel/panel-preferences-dialog.c:1081 +#: ../panel/panel-preferences-dialog.c:1097 msgid "If you remove the item from the panel, it is permanently lost." msgstr "Se si rimuove l'elemento dal pannello, verrà perso per sempre." @@ -95,57 +74,57 @@ msgid "Pane_l" msgstr "_Pannello" #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2339 +#: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2365 msgid "Add _New Items..." msgstr "A_ggiungi nuovi elementi..." #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2350 +#: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2376 msgid "Panel Pr_eferences..." msgstr "_Preferenze del pannello..." #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2366 +#: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2404 msgid "Log _Out" msgstr "_Esci" -#: ../panel/main.c:78 +#: ../panel/main.c:79 msgid "Show the 'Panel Preferences' dialog" msgstr "Mostra la finestra di personalizzazione del pannello" -#: ../panel/main.c:78 ../panel/main.c:79 +#: ../panel/main.c:79 ../panel/main.c:80 msgid "PANEL-NUMBER" msgstr "NUMERO-PANNELLO" -#: ../panel/main.c:79 +#: ../panel/main.c:80 msgid "Show the 'Add New Items' dialog" msgstr "Mostra la finestra per aggiungere nuovi elementi" -#: ../panel/main.c:80 +#: ../panel/main.c:81 msgid "Save the panel configuration" msgstr "Salva la configurazione del pannello" -#: ../panel/main.c:81 +#: ../panel/main.c:82 msgid "Add a new plugin to the panel" msgstr "Aggiunge un nuovo plugin al pannello" -#: ../panel/main.c:81 +#: ../panel/main.c:82 msgid "PLUGIN-NAME" msgstr "NOME-PLUGIN" -#: ../panel/main.c:82 +#: ../panel/main.c:83 msgid "Restart the running panel instance" msgstr "Riavvia l'istanza del pannello in esecuzione" -#: ../panel/main.c:83 +#: ../panel/main.c:84 msgid "Quit the running panel instance" msgstr "Esce dall'istanza del pannello in esecuzione" -#: ../panel/main.c:84 +#: ../panel/main.c:85 msgid "Do not wait for a window manager on startup" msgstr "Non attendere un gestore delle finestre all'avvio" -#: ../panel/main.c:85 +#: ../panel/main.c:86 #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:33 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:33 #: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:33 @@ -153,62 +132,62 @@ msgid "Print version information and exit" msgstr "Stampa le informazioni di versione ed esce" #. parse
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to ee8770813cd8bf58369127181100278989b057e9 (commit) from 8d887c6b7e5b48c0e26eb49409022f5bd78ed89a (commit) commit ee8770813cd8bf58369127181100278989b057e9 Author: Cristian Marchi Date: Sat Mar 31 08:36:40 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 232 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 32 ++-- 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/po/it.po b/po/it.po index 4debf79..01d44ff 100644 --- a/po/it.po +++ b/po/it.po @@ -4,12 +4,12 @@ # Gabriele Modena , 2005. # Alex Dupre , 2004, 2005. # Cristian Marchi , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfwm4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-13 23:10+0100\n" +"POT-Creation-Date: 2012-03-31 05:42+\n" "PO-Revision-Date: 2010-09-08 11:45+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" @@ -521,24 +521,20 @@ msgid "Move window to workspace 12" msgstr "Sposta la finestra nello spazio di lavoro 12" #: ../settings-dialogs/xfwm4-settings.c:281 -#, fuzzy msgid "Tile window to the top" -msgstr "Sposta la finestra nello spazio di lavoro di sinistra" +msgstr "Riquadra la finestra in alto" #: ../settings-dialogs/xfwm4-settings.c:282 -#, fuzzy msgid "Tile window to the bottom" -msgstr "Sposta la finestra nello spazio di lavoro inferiore" +msgstr "Riquadra la finestra in basso" #: ../settings-dialogs/xfwm4-settings.c:283 -#, fuzzy msgid "Tile window to the left" -msgstr "Sposta la finestra nello spazio di lavoro di sinistra" +msgstr "Riquadra la finestra a sinistra" #: ../settings-dialogs/xfwm4-settings.c:284 -#, fuzzy msgid "Tile window to the right" -msgstr "Sposta la finestra nello spazio di lavoro di destra" +msgstr "Riquadra la finestra a destra" #: ../settings-dialogs/xfwm4-settings.c:285 msgid "Show desktop" @@ -881,35 +877,35 @@ msgstr "_Numero degli spazi di lavoro:" msgid "%s (on %s)" msgstr "%s (su %s)" -#: ../src/main.c:540 +#: ../src/main.c:538 msgid "Fork to the background" msgstr "Esegue il fork in background" -#: ../src/main.c:542 +#: ../src/main.c:540 msgid "Fork to the background (not supported)" msgstr "Esegue il fork in background (non supportato)" -#: ../src/main.c:545 +#: ../src/main.c:543 msgid "Set the compositor mode" msgstr "Imposta la modalità del compositore" -#: ../src/main.c:547 +#: ../src/main.c:545 msgid "Set the compositor mode (not supported)" msgstr " Imposta la modalità del compositore (non supportato) " -#: ../src/main.c:549 +#: ../src/main.c:547 msgid "Replace the existing window manager" msgstr "Sostituisce il gestore di finestre esistente" -#: ../src/main.c:550 +#: ../src/main.c:548 msgid "Print version information and exit" msgstr "Stampa le informazioni di versione ed esce" -#: ../src/main.c:558 +#: ../src/main.c:556 msgid "[ARGUMENTS...]" msgstr "[ARGOMENTI...]" -#: ../src/main.c:565 +#: ../src/main.c:563 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Digitare \"%s --help\" per le informazioni di utilizzo" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deprecate redundant midori_findbar_find
Updating branch refs/heads/master
to b8380232894669a10e19acb10b3dce7c626e9ae5 (commit)
from 79942f24aa1337afafa0359b3d7ef2daa14f7268 (commit)
commit b8380232894669a10e19acb10b3dce7c626e9ae5
Author: Christian Dywan
Date: Sat Mar 31 03:36:00 2012 +0200
Deprecate redundant midori_findbar_find
midori/midori-browser.c |4 ++--
toolbars/midori-findbar.c | 23 +--
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5061ec0..cb8c04d 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2752,14 +2752,14 @@ static void
_action_find_next_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE);
+midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, TRUE);
}
static void
_action_find_previous_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE);
+midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, FALSE);
}
static void
diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index 6ef47f2..cbee17b 100644
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2010 Christian Dywan
+ Copyright (C) 2008-2012 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -97,7 +97,7 @@ midori_findbar_find_key_press_event_cb (MidoriFindbar*
findbar,
else if (event->keyval == GDK_KEY_Return
&& (event->state & GDK_SHIFT_MASK))
{
-midori_findbar_find (findbar, FALSE);
+midori_findbar_find_text (findbar, NULL, FALSE);
return TRUE;
}
@@ -141,6 +141,9 @@ midori_findbar_find_text (MidoriFindbar* findbar,
if (!(view = midori_browser_get_current_tab (browser)))
return;
+if (text == NULL)
+text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
+
case_sensitive = midori_findbar_case_sensitive (findbar);
midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive,
forward);
}
@@ -161,12 +164,20 @@ midori_findbar_get_text (MidoriFindbar* findbar)
return gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
}
+/**
+ * midori_findbar_find:
+ * @findbar: #MidoriFindbar
+ * @forward: %TRUE to search forward
+ *
+ * Advance to the next match.
+ *
+ * Deprecated: 0.4.5: Use midori_findbar_find_text() instead.
+ **/
void
midori_findbar_find (MidoriFindbar* findbar,
gboolean forward)
{
-const gchar* text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
-midori_findbar_find_text (findbar, text, forward);
+midori_findbar_find_text (findbar, NULL, forward);
}
void
@@ -195,14 +206,14 @@ static void
midori_findbar_next_activate_cb (GtkWidget* entry,
MidoriFindbar* findbar)
{
-midori_findbar_find (findbar, TRUE);
+midori_findbar_find_text (findbar, NULL, TRUE);
}
static void
midori_findbar_previous_clicked_cb (GtkWidget* entry,
MidoriFindbar* findbar)
{
-midori_findbar_find (findbar, FALSE);
+midori_findbar_find_text (findbar, NULL, FALSE);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fallback midori_view_search_text to overlay
Updating branch refs/heads/master
to 79942f24aa1337afafa0359b3d7ef2daa14f7268 (commit)
from 3e0dc32017b84b2c4b7a91445894b8eab7e2ef02 (commit)
commit 79942f24aa1337afafa0359b3d7ef2daa14f7268
Author: Christian Dywan
Date: Sat Mar 31 03:33:00 2012 +0200
Fallback midori_view_search_text to overlay
midori/midori-view.c |9 +
toolbars/midori-findbar.c | 16
toolbars/midori-findbar.h |5 -
3 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index e985aec..6d392f7 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5593,6 +5593,15 @@ midori_view_search_text (MidoriView* view,
{
g_return_if_fail (MIDORI_IS_VIEW (view));
+#if GTK_CHECK_VERSION (3, 2, 0)
+if (gtk_widget_get_visible (view->overlay_find))
+{
+text = midori_findbar_get_text (MIDORI_FINDBAR (view->overlay_find));
+webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view),
+text, case_sensitive, forward, TRUE);
+return;
+}
+#endif
g_signal_emit (view, signals[SEARCH_TEXT], 0,
webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view),
text, case_sensitive, forward, TRUE), NULL);
diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index 22ab5da..6ef47f2 100644
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -145,6 +145,22 @@ midori_findbar_find_text (MidoriFindbar* findbar,
midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive,
forward);
}
+/**
+ * midori_findbar_get_text:
+ * @findbar: #MidoriFindbar
+ *
+ * Returns: the text typed in the entry
+ *
+ * Since: 0.4.5
+ **/
+const gchar*
+midori_findbar_get_text (MidoriFindbar* findbar)
+{
+g_return_val_if_fail (MIDORI_IS_FINDBAR (findbar), NULL);
+
+return gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
+}
+
void
midori_findbar_find (MidoriFindbar* findbar,
gboolean forward)
diff --git a/toolbars/midori-findbar.h b/toolbars/midori-findbar.h
index 5f1a54c..7a7ea19 100644
--- a/toolbars/midori-findbar.h
+++ b/toolbars/midori-findbar.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010 Christian Dywan
+ Copyright (C) 2012 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -47,6 +47,9 @@ midori_findbar_find_text (MidoriFindbar* findbar,
const gchar* text,
gboolean forward);
+const gchar*
+midori_findbar_get_text(MidoriFindbar* findbar);
+
void
midori_findbar_set_can_find (MidoriFindbar* findbar,
gboolean can_find);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Show at most 10 back/ forward history items
Updating branch refs/heads/master to 4c4c84944182bb6ad582078c976c2ba85511bf00 (commit) from a6f9bea939b8eea1e990b1899b436a3834fe2948 (commit) commit 4c4c84944182bb6ad582078c976c2ba85511bf00 Author: Christian Dywan Date: Sat Mar 31 02:50:51 2012 +0200 Show at most 10 back/ forward history items Consistent with trash. midori/midori-browser.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0692d71..5061ec0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6516,6 +6516,8 @@ midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser, g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (midori_browser_toolbar_popup_context_menu_history_cb), browser); +if (steps == (10 - 1)) +break; } webkit_web_back_forward_list_go_to_item (list, current_item); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use sqlite WAL mode for history if available
Updating branch refs/heads/master
to 3e0dc32017b84b2c4b7a91445894b8eab7e2ef02 (commit)
from 4c4c84944182bb6ad582078c976c2ba85511bf00 (commit)
commit 3e0dc32017b84b2c4b7a91445894b8eab7e2ef02
Author: Alexander Butenko
Date: Sat Mar 31 03:28:06 2012 +0200
Use sqlite WAL mode for history if available
midori/main.c |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index b19914f..ac187d9 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -441,9 +441,12 @@ midori_history_initialize (KatzeArray* array,
return FALSE;
}
+if (sqlite3_exec (db,
+"PRAGMA journal_mode = WAL; PRAGMA cache_size = 32100;",
+NULL, NULL, errmsg) != SQLITE_OK)
+sqlite3_exec (db, "PRAGMA journal_mode = TRUNCATE;", NULL, NULL,
errmsg);
sqlite3_exec (db,
-/* "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY" */
-"PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;",
+"PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;",
NULL, NULL, errmsg);
if (*errmsg)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Typo: Instead of the array each item should be checked
Updating branch refs/heads/master
to a6f9bea939b8eea1e990b1899b436a3834fe2948 (commit)
from 63ac08c6a31b996c9b1b6ef5c97d800f4d66cc1e (commit)
commit a6f9bea939b8eea1e990b1899b436a3834fe2948
Author: André Stösel
Date: Fri Mar 30 19:34:57 2012 +0200
Typo: Instead of the array each item should be checked
midori/main.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 50d3ebc..b19914f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1312,7 +1312,7 @@ midori_load_extensions (gpointer data)
MidoriExtension* extension_item;
KATZE_ARRAY_FOREACH_ITEM (extension_item,
KATZE_ARRAY (extension))
{
-if (MIDORI_IS_EXTENSION (extension))
+if (MIDORI_IS_EXTENSION (extension_item))
midori_load_extension (app, extensions,
active_extensions, extension_item,
filename);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 1a2efa547a87c3f472f3a176b71700c1218f49a8 (commit) from 2908e74603c1ca2cda903c48ae823240d81c8b21 (commit) commit 1a2efa547a87c3f472f3a176b71700c1218f49a8 Author: Chipong Luo Date: Sat Mar 31 02:14:12 2012 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 145 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 261 +++ 1 files changed, 137 insertions(+), 124 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6dd253c..75931ae 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2012-03-28 09:15+\n" +"POT-Creation-Date: 2012-03-30 19:15+\n" "PO-Revision-Date: 2010-11-23 23:34+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" @@ -49,312 +49,311 @@ msgstr "" "尝试 %s --help 查看\n" "可用命令行选项的完整列表。\n" -#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "图片查看器" #. File Menu -#: ../src/main_window.c:334 +#: ../src/main_window.c:330 msgid "_File" msgstr "文件(_F)" -#: ../src/main_window.c:335 +#: ../src/main_window.c:331 msgid "_Open" msgstr "打开(_O)" -#: ../src/main_window.c:335 +#: ../src/main_window.c:331 msgid "Open an image" msgstr "打开图片" -#: ../src/main_window.c:336 +#: ../src/main_window.c:332 msgid "_Save copy" msgstr "保存副本(_S)" -#: ../src/main_window.c:336 +#: ../src/main_window.c:332 msgid "Save a copy of the image" msgstr "保存此图片的一份副本" -#: ../src/main_window.c:337 +#: ../src/main_window.c:333 msgid "_Properties" msgstr "属性(_P)" -#: ../src/main_window.c:337 +#: ../src/main_window.c:333 msgid "Show file properties" msgstr "显示文件属性" -#: ../src/main_window.c:338 +#. Edit Menu +#: ../src/main_window.c:334 ../src/main_window.c:338 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../src/main_window.c:334 +msgid "Edit this image" +msgstr "编辑此图片" + +#: ../src/main_window.c:335 msgid "_Close" msgstr "关闭(_C)" -#: ../src/main_window.c:338 +#: ../src/main_window.c:335 msgid "Close this image" msgstr "关闭此图片" -#: ../src/main_window.c:339 +#: ../src/main_window.c:336 msgid "_Quit" msgstr "退出(_Q)" -#: ../src/main_window.c:339 +#: ../src/main_window.c:336 msgid "Quit Ristretto" msgstr "退出 Ristretto" -#. Edit Menu -#: ../src/main_window.c:341 -msgid "_Edit" -msgstr "编辑(_E)" - -#: ../src/main_window.c:342 +#: ../src/main_window.c:339 msgid "_Open with..." msgstr "打开方式(_O)" -#: ../src/main_window.c:343 +#: ../src/main_window.c:340 msgid "_Sorting" msgstr "排列(_S)" -#: ../src/main_window.c:344 +#: ../src/main_window.c:341 msgid "_Delete" msgstr "删除(_D)" -#: ../src/main_window.c:344 +#: ../src/main_window.c:341 msgid "Delete this image from disk" msgstr "从磁盘中删除此图片" -#: ../src/main_window.c:345 +#: ../src/main_window.c:342 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../src/main_window.c:346 +#: ../src/main_window.c:343 msgid "_Preferences" msgstr "首选项(_P)" #. View Menu -#: ../src/main_window.c:348 +#: ../src/main_window.c:345 msgid "_View" msgstr "视图(_V)" -#: ../src/main_window.c:349 +#: ../src/main_window.c:346 msgid "_Fullscreen" msgstr "全屏(_F)" -#: ../src/main_window.c:350 +#: ../src/main_window.c:347 msgid "_Leave Fullscreen" msgstr "离开全屏(_L)" -#: ../src/main_window.c:351 +#: ../src/main_window.c:348 msgid "_Set as Wallpaper" msgstr "设置为壁纸(_S)" #. Zoom submenu -#: ../src/main_window.c:353 +#: ../src/main_window.c:350 msgid "_Zoom" msgstr "缩放(_Z)" -#: ../src/main_window.c:354 +#: ../src/main_window.c:351 msgid "Zoom _In" msgstr "放大(_I)" -#: ../src/main_window.c:355 +#: ../src/main_window.c:352 msgid "Zoom _Out" msgstr "缩小(_O)" -#: ../src/main_window.c:356 +#: ../src/main_window.c:353 msgid "Zoom _Fit" msgstr "合适大小(_F)" -#: ../src/main_window.c:357 +#: ../src/main_window.c:354 msgid "_Normal Size" msgstr "正常大小(_N)" #. Rotation submenu -#: ../src/main_window.c:359 +#: ../src/main_window.c:356 msgid "_Rotation" msgstr "旋转(_R)" -#: ../src/main_window.c:360 +#: ../src/main_window.c:357 msgid "Rotate _Right" msgstr "顺时针旋转(_R)" -#: ../src/main_window.c:361 +#: ../src/main_window.c:358 msgid "Rotate _Left" msgstr "逆时针旋转(_L)" #. Go Menu -#: ../src/main_window.c:363 +#: ../src/main_window.c:360 msgid "_Go" msgstr "转到(_G)" -#: ../src/main_window.c:364 +#: ../src/main_window.c:361 msgid "_Forward" msgstr "前进(_F)" -#: ../src/main_window.c:365 +#: ../src/main_window.c:362 msgid "_Back" msgstr "后退(_B)" -#: ../src/main_window.c:366 +#: ../src/main_window.c:363 msgid "_First" msgstr "第一个(_F)" -#: ../src/main_window.c:367 +#: ../src/main_window.c:364 msgid "_Last" msgstr "最后一个(_L)" #. Help Menu -#: ../src/main_window.
[Xfce4-commits] l10n: Updated Basque (eu) translation to 98%
Updating branch refs/heads/master to 277b57079b75c8703f5c64d5c6b68c74b620d7d5 (commit) from 3515a7bbc2403bcc972e8f11314de99d6cd92e2b (commit) commit 277b57079b75c8703f5c64d5c6b68c74b620d7d5 Author: Piarres Beobide Date: Sat Mar 31 00:59:49 2012 +0200 l10n: Updated Basque (eu) translation to 98% New status: 205 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 549 +++--- 1 files changed, 273 insertions(+), 276 deletions(-) diff --git a/po/eu.po b/po/eu.po index 9cdc3fd..197db7f 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-08 22:06+\n" +"POT-Creation-Date: 2012-03-30 22:03+\n" "PO-Revision-Date: 2009-08-21 11:07+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara\n" @@ -140,97 +140,13 @@ msgstr "Soila" msgid "Simple Splash Engine" msgstr "Abiarazte errobot soila" -#: ../panel-plugin/xfsm-logout-plugin.c:86 -msgid "Session" -msgstr "Saioa" +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "Abiarazi pantaila-babeslea eta blokeo programa" -#: ../panel-plugin/xfsm-logout-plugin.c:87 -msgid "Loc_k screen" -msgstr "Blo_keatu pantaila" - -#: ../panel-plugin/xfsm-logout-plugin.c:88 -#: ../panel-plugin/xfsm-logout-plugin.c:128 -msgid "_Suspend" -msgstr "E_seki" - -#: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 -msgid "_Hibernate" -msgstr "_Hibernatu" - -#: ../panel-plugin/xfsm-logout-plugin.c:90 -#: ../panel-plugin/xfsm-logout-plugin.c:121 -msgid "_Reboot" -msgstr "Be_rrabiarazi" - -#: ../panel-plugin/xfsm-logout-plugin.c:91 -#: ../panel-plugin/xfsm-logout-plugin.c:114 -msgid "Shut _down" -msgstr "I_tzali" - -#: ../panel-plugin/xfsm-logout-plugin.c:92 -#: ../panel-plugin/xfsm-logout-plugin.c:107 -msgid "_Log out" -msgstr "Saioa _utzi" - -#. XFSM_SHUTDOWN_ASK -#. XFSM_SHUTDOWN_LOGOUT -#: ../panel-plugin/xfsm-logout-plugin.c:105 -msgid "Are you sure you want to log out?" -msgstr "Ziur zaude saioa amaitu nahi duzula?" - -#: ../panel-plugin/xfsm-logout-plugin.c:106 -#, c-format -msgid "You will be logged out in %u seconds." -msgstr "%u segundo barru saioa itxiko da." - -#: ../panel-plugin/xfsm-logout-plugin.c:109 -msgid "Failed to log out." -msgstr "Huts saioa ixterakoan." - -#. XFSM_SHUTDOWN_HALT -#: ../panel-plugin/xfsm-logout-plugin.c:112 -msgid "Are you sure you want to shut down?" -msgstr "Ziur zaude itzali nahi duzula?" - -#: ../panel-plugin/xfsm-logout-plugin.c:113 -#, c-format -msgid "Your system will shut down in %u seconds." -msgstr "Sistema %u segundo barru itzaliko da." - -#: ../panel-plugin/xfsm-logout-plugin.c:116 -msgid "Failed to shut down." -msgstr "Huts itzaltzerakoan." - -#. XFSM_SHUTDOWN_REBOOT -#: ../panel-plugin/xfsm-logout-plugin.c:119 -msgid "Are you sure you want to reboot?" -msgstr "Ziur zaude berrabiarazi nahi duzula?" - -#: ../panel-plugin/xfsm-logout-plugin.c:120 -#, c-format -msgid "Your system will reboot in %u seconds." -msgstr "Sistema %u segundu barru berrabiaraziko da." - -#: ../panel-plugin/xfsm-logout-plugin.c:123 -msgid "Failed to reboot." -msgstr "Huts berrabiaraztean." - -#: ../panel-plugin/xfsm-logout-plugin.c:130 -msgid "Failed to suspend" -msgstr "Huts esekitzerakoan" - -#: ../panel-plugin/xfsm-logout-plugin.c:137 -msgid "Failed to hibernate" -msgstr "Huts hibernatzean" - -#: ../panel-plugin/xfsm-logout-plugin.c:150 -msgid "Xflock4 could not be launched" -msgstr "Ezin da Xflock4 abiarazi" - -#: ../panel-plugin/xfsm-logout-plugin.c:222 -msgid "Close Session" -msgstr "Itxi saioa" +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "Pantaila-babeslea" #: ../settings/main.c:43 msgid "Settings manager socket" @@ -244,25 +160,27 @@ msgstr "SOCKET IDa" msgid "Version information" msgstr "Bertsio argibideak" -#: ../settings/main.c:74 +#: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." msgstr "Idatzi '%s --help' erabilerarentzat." -#: ../settings/main.c:86 ../xfce4-session/main.c:219 +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:124 msgid "The Xfce development team. All rights reserved." msgstr "Xfce garapen taldea. Eskubide guztiak erreserbaturik." -#: ../settings/main.c:87 ../xfce4-session/main.c:225 +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:127 #, c-format msgid "Please report bugs to <%s>." msgstr "Programa erroreen berri eman hemen : <%s>" -#: ../settings/main.c:96 ../xfce4-session/main.c:231 +#: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" msgstr "Ezin da ezarpen zerbitzaria konektatu" -#: ../settings/main.c:115 +#: ../set
[Xfce4-commits] l10n: Updated Basque (eu) translation to 100%
Updating branch refs/heads/master to eb6fcd420e35b2ce0c0f9604317453c13a4847a3 (commit) from 7b08b1ed6f3e085bbed6f295fbac46f45faf9e05 (commit) commit eb6fcd420e35b2ce0c0f9604317453c13a4847a3 Author: Piarres Beobide Date: Sat Mar 31 00:54:52 2012 +0200 l10n: Updated Basque (eu) translation to 100% New status: 681 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 96 - 1 files changed, 50 insertions(+), 46 deletions(-) diff --git a/po/eu.po b/po/eu.po index fbce6b0..d61dfad 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-17 03:24+\n" +"POT-Creation-Date: 2012-03-30 19:36+\n" "PO-Revision-Date: 2010-11-21 00:22+0100\n" "Last-Translator: \n" "Language-Team: Basque \n" @@ -16,8 +16,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../thunar/main.c:62 msgid "Open the bulk rename dialog" @@ -136,7 +136,7 @@ msgstr "Huts ekintza abiarazterakoan" #. tell the user that we were unable to launch the file specified #: ../thunar/thunar-application.c:1048 ../thunar/thunar-application.c:1174 -#: ../thunar/thunar-launcher.c:1046 ../thunar/thunar-location-entry.c:394 +#: ../thunar/thunar-launcher.c:1057 ../thunar/thunar-location-entry.c:394 #: ../thunar/thunar-location-entry.c:422 #: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1509 #, c-format @@ -253,7 +253,7 @@ msgstr "Zakarrontziko fitxategi eta direktorio guztiak ezabatu?" #. prepare the menu item #: ../thunar/thunar-application.c:1894 ../thunar/thunar-location-buttons.c:171 #: ../thunar/thunar-shortcuts-view.c:875 ../thunar/thunar-tree-view.c:1145 -#: ../thunar/thunar-window.c:297 ../plugins/thunar-tpa/thunar-tpa.c:177 +#: ../thunar/thunar-window.c:297 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid "_Empty Trash" msgstr "Zakarrontzia _hustu" @@ -651,65 +651,69 @@ msgid "Confirm to replace files" msgstr "Berretsi fitxategiak ordezteko" #: ../thunar/thunar-dialogs.c:508 +msgid "S_kip All" +msgstr "Sa_lto denak" + +#: ../thunar/thunar-dialogs.c:509 msgid "_Skip" msgstr "_Salto" -#: ../thunar/thunar-dialogs.c:509 +#: ../thunar/thunar-dialogs.c:510 msgid "Replace _All" msgstr "Denak _adatu" -#: ../thunar/thunar-dialogs.c:510 +#: ../thunar/thunar-dialogs.c:511 msgid "_Replace" msgstr "O_rdeztu" -#: ../thunar/thunar-dialogs.c:542 +#: ../thunar/thunar-dialogs.c:544 #, c-format msgid "This folder already contains a symbolic link \"%s\"." msgstr "Karpeta honek badu dagoeneko \"%s\" izeneko lotura sinboliko bat." -#: ../thunar/thunar-dialogs.c:547 +#: ../thunar/thunar-dialogs.c:549 #, c-format msgid "This folder already contains a folder \"%s\"." msgstr "Karpeta honek badu dagoeneko \"%s\" izeneko karpeta bat." -#: ../thunar/thunar-dialogs.c:552 +#: ../thunar/thunar-dialogs.c:554 #, c-format msgid "This folder already contains a file \"%s\"." msgstr "Karpeta honek badu dagoeneko \"%s\" izeneko fitxategi bat." -#: ../thunar/thunar-dialogs.c:564 +#: ../thunar/thunar-dialogs.c:566 msgid "ReplaceDialogPart1|Do you want to replace the link" msgstr "Dagoen lotura ordeztu nahi al duzu" -#: ../thunar/thunar-dialogs.c:566 +#: ../thunar/thunar-dialogs.c:568 msgid "ReplaceDialogPart1|Do you want to replace the existing folder" msgstr "Dagoen karpeta ordeztu nahi duzu" -#: ../thunar/thunar-dialogs.c:568 +#: ../thunar/thunar-dialogs.c:570 msgid "ReplaceDialogPart1|Do you want to replace the existing file" msgstr "Dagoen fitxategia ordeztu nahi duzu" #. Fourth box (size, volume, free space) #. -#: ../thunar/thunar-dialogs.c:585 ../thunar/thunar-dialogs.c:616 +#: ../thunar/thunar-dialogs.c:587 ../thunar/thunar-dialogs.c:618 #: ../thunar/thunar-properties-dialog.c:418 msgid "Size:" msgstr "Tamaina:" -#: ../thunar/thunar-dialogs.c:585 ../thunar/thunar-dialogs.c:616 +#: ../thunar/thunar-dialogs.c:587 ../thunar/thunar-dialogs.c:618 #: ../thunar/thunar-properties-dialog.c:379 msgid "Modified:" msgstr "Aldaketa:" -#: ../thunar/thunar-dialogs.c:595 +#: ../thunar/thunar-dialogs.c:597 msgid "ReplaceDialogPart2|with the following link?" msgstr "hurrengo lotura honez?" -#: ../thunar/thunar-dialogs.c:597 +#: ../thunar/thunar-dialogs.c:599 msgid "ReplaceDialogPart2|with the following folder?" msgstr "hurrengo karpeta honez?" -#: ../thunar/thunar-dialogs.c:599 +#: ../thunar/thunar-dialogs.c:601 msgid "ReplaceDialogPart2|with the following file?" msgstr "hurrengo fitxategi honez?" @@ -964,7 +968,7 @@ msgid "Do you want to skip it?" msgstr "Salto egin nahi al duzu?" #. append the "Open" menu action -#: ../thunar/thunar-lau
[Xfce4-commits] Feed compatibility.
Updating branch refs/heads/master
to 57646f2c8d719b74a9a2bb2fdccea80f40e53c59 (commit)
from adbd98c46731723601f6f9250c24df7277f8c6e8 (commit)
commit 57646f2c8d719b74a9a2bb2fdccea80f40e53c59
Author: Nick Schermer
Date: Sat Mar 31 00:03:20 2012 +0200
Feed compatibility.
index.php |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/index.php b/index.php
index ec2bf9b..a541908 100644
--- a/index.php
+++ b/index.php
@@ -16,6 +16,14 @@ include ('lib/core.php');
$uri_a = explode('?', $_SERVER['REQUEST_URI']);
$uri = trim (strtolower ($uri_a[0]), '/');
+/* compatibility with old website */
+if (isset ($_GET['feed']) && $_GET['feed'] == 'rss2')
+{
+ header ('HTTP/1.1 301 Moved Permanently');
+ header ('Location: http://www.xfce.org/feed');
+ exit;
+}
+
/* lookup to page from the uri */
$content_file = lookup_page ($uri);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make common no-reply error more subtile.
Updating branch refs/heads/master
to 3515a7bbc2403bcc972e8f11314de99d6cd92e2b (commit)
from 1b21ed4a608109b16aad100e9759a96815d4e162 (commit)
commit 3515a7bbc2403bcc972e8f11314de99d6cd92e2b
Author: Nick Schermer
Date: Fri Mar 30 23:28:15 2012 +0200
Make common no-reply error more subtile.
xfce4-session/xfsm-upower.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xfce4-session/xfsm-upower.c b/xfce4-session/xfsm-upower.c
index b1491ab..57402ec 100644
--- a/xfce4-session/xfsm-upower.c
+++ b/xfce4-session/xfsm-upower.c
@@ -249,10 +249,12 @@ xfsm_upower_try_method_cb (DBusGProxy *proxy,
if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID,
G_TYPE_INVALID))
{
-g_warning ("Failed to suspend the system: %s %d %s",
- g_quark_to_string (error->domain),
- error->code, error->message);
-g_error_free (error);
+ if (g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY))
+g_message ("Reply after suspend/hibernate timed out. Continuing...");
+ else
+g_warning ("Failed to suspend the system: %s", error->message);
+
+ g_error_free (error);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use LT_PREREQ and LT_INIT.
Updating branch refs/heads/master to c14d8d9563aebd05551ff5418d0411dfbbbc71d1 (commit) from 9290560e8da70d8d616e1d8a2e4bdd577d47a75a (commit) commit c14d8d9563aebd05551ff5418d0411dfbbbc71d1 Author: Nick Schermer Date: Fri Mar 30 23:10:47 2012 +0200 Use LT_PREREQ and LT_INIT. configure.ac.in |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 1648c6e..cd1f6f2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -45,11 +45,13 @@ dnl check for basic programs AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL -AC_PROG_LIBTOOL AC_PROG_INTLTOOL AC_PROG_MAKE_SET AC_PROG_LN_S +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl check for standard header files AC_HEADER_STDC AC_CHECK_HEADERS([errno.h fcntl.h grp.h locale.h \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 2908e74603c1ca2cda903c48ae823240d81c8b21 (commit) from ece295739705d1e6fa824062f58d6eeaa70e9dbf (commit) commit 2908e74603c1ca2cda903c48ae823240d81c8b21 Author: Seong-ho Cho Date: Fri Mar 30 21:49:01 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 145 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 275 - 1 files changed, 144 insertions(+), 131 deletions(-) diff --git a/po/ko.po b/po/ko.po index fa13484..1467f6b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2012-03-26 16:39+\n" -"PO-Revision-Date: 2012-03-29 19:05+0900\n" +"POT-Creation-Date: 2012-03-30 19:15+\n" +"PO-Revision-Date: 2012-03-31 04:48+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: xfce4-users-kr-i18n \n" "Language: ko\n" @@ -55,316 +55,316 @@ msgstr "" "사용할 수 있는 명령줄 옵션의 전체 목록을\n" "보려면 %s --help를 입력합니다.\n" -#: ../src/main_window.c:53 +#: ../src/main_window.c:55 #: ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "그림 보기" #. File Menu -#: ../src/main_window.c:334 +#: ../src/main_window.c:330 msgid "_File" msgstr "파일(_F)" -#: ../src/main_window.c:335 +#: ../src/main_window.c:331 msgid "_Open" msgstr "열기(_O)" -#: ../src/main_window.c:335 +#: ../src/main_window.c:331 msgid "Open an image" msgstr "그림 열기" -#: ../src/main_window.c:336 +#: ../src/main_window.c:332 msgid "_Save copy" msgstr "사본 저장(_S)" -#: ../src/main_window.c:336 +#: ../src/main_window.c:332 msgid "Save a copy of the image" msgstr "그림 사본 저장" -#: ../src/main_window.c:337 +#: ../src/main_window.c:333 msgid "_Properties" msgstr "속성(_P)" -#: ../src/main_window.c:337 +#: ../src/main_window.c:333 msgid "Show file properties" msgstr "파일 속성 보이기" +#. Edit Menu +#: ../src/main_window.c:334 #: ../src/main_window.c:338 +msgid "_Edit" +msgstr "편집(_E)" + +#: ../src/main_window.c:334 +msgid "Edit this image" +msgstr "이 그림 편집" + +#: ../src/main_window.c:335 msgid "_Close" msgstr "닫기(_C)" -#: ../src/main_window.c:338 +#: ../src/main_window.c:335 msgid "Close this image" msgstr "이 그림 닫기" -#: ../src/main_window.c:339 +#: ../src/main_window.c:336 msgid "_Quit" msgstr "나가기(_Q)" -#: ../src/main_window.c:339 +#: ../src/main_window.c:336 msgid "Quit Ristretto" msgstr "리스트레또 나가기" -#. Edit Menu -#: ../src/main_window.c:341 -msgid "_Edit" -msgstr "편집(_E)" - -#: ../src/main_window.c:342 +#: ../src/main_window.c:339 msgid "_Open with..." msgstr "다음으로 열기(_O)..." -#: ../src/main_window.c:343 +#: ../src/main_window.c:340 msgid "_Sorting" msgstr "정렬(_S)" -#: ../src/main_window.c:344 +#: ../src/main_window.c:341 msgid "_Delete" msgstr "삭제(_D)" -#: ../src/main_window.c:344 +#: ../src/main_window.c:341 msgid "Delete this image from disk" msgstr "이 그림을 디스크에서 삭제" -#: ../src/main_window.c:345 +#: ../src/main_window.c:342 msgid "_Clear private data" msgstr "개인 데이터 지우기(_C)" -#: ../src/main_window.c:346 +#: ../src/main_window.c:343 msgid "_Preferences" msgstr "기본 설정(_P)" #. View Menu -#: ../src/main_window.c:348 +#: ../src/main_window.c:345 msgid "_View" msgstr "보기(_V)" -#: ../src/main_window.c:349 +#: ../src/main_window.c:346 msgid "_Fullscreen" msgstr "전체 화면(_F)" -#: ../src/main_window.c:350 +#: ../src/main_window.c:347 msgid "_Leave Fullscreen" msgstr "전체 화면 나가기(_L)" -#: ../src/main_window.c:351 +#: ../src/main_window.c:348 msgid "_Set as Wallpaper" msgstr "배경화면으로 설정(_S)" #. Zoom submenu -#: ../src/main_window.c:353 +#: ../src/main_window.c:350 msgid "_Zoom" msgstr "확대(_Z)" -#: ../src/main_window.c:354 +#: ../src/main_window.c:351 msgid "Zoom _In" msgstr "확대(_I)" -#: ../src/main_window.c:355 +#: ../src/main_window.c:352 msgid "Zoom _Out" msgstr "축소(_O)" -#: ../src/main_window.c:356 +#: ../src/main_window.c:353 msgid "Zoom _Fit" msgstr "화면에 맞추기(_F)" -#: ../src/main_window.c:357 +#: ../src/main_window.c:354 msgid "_Normal Size" msgstr "본래 크기(_N)" #. Rotation submenu -#: ../src/main_window.c:359 +#: ../src/main_window.c:356 msgid "_Rotation" msgstr "회전(_R)" -#: ../src/main_window.c:360 +#: ../src/main_window.c:357 msgid "Rotate _Right" msgstr "오른쪽으로 회전(_R)" -#: ../src/main_window.c:361 +#: ../src/main_window.c:358 msgid "Rotate _Left" msgstr "왼쪽으로 회전(_L)" #. Go Menu -#: ../src/main_window.c:363 +#: ../src/main_window.c:360 msgid "_Go" msgstr "이동(_G)" -#: ../src/main_window.c:364 +#: ../src/main_window.c:361 msgid "_Forward" msgstr "다음(_F)" -#: ../src/main_window.c:365 +#: ../src/main_window.c:362 msgid "_Back" msgstr "이전(_B)" -#: ../src/main_window.c:366 +#: ../src/main_window.c:363 msgid "_First" msgstr "처음(_F)" -#: ../src/main_window.c:367 +#: ../src/main_window.c:364 msgid "_Last" msgstr "
[Xfce4-commits] Creating annotated tag xfce4-panel-4.9.1
Updating annotated tag refs/tags/xfce4-panel-4.9.1 as new annotated tag to 553dd1f5e07cdec3b4754eb2bf4b3ca31b72afbe (tag) succeeds xfce4-panel-4.9.0-152-g1d01534 tagged by Nick Schermer on 2012-03-30 21:36 +0200 Nick Schermer (1): Updates for release. ___ 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 9d97afcc71e55e5c1363a3ca126eab96aac4da24 (commit) from 03e0755055ee548020734c22d494087ee080fbce (commit) commit 9d97afcc71e55e5c1363a3ca126eab96aac4da24 Author: Nick Schermer Date: Fri Mar 30 21:36:47 2012 +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 2d09d63..87e18b5 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -16,7 +16,7 @@ m4_define([xfce4_panel_version_minor], [9]) m4_define([xfce4_panel_version_micro], [1]) 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/master to 03e0755055ee548020734c22d494087ee080fbce (commit) from 1d01534d8e6e3964a589286ae900eb3e713cc44e (commit) commit 03e0755055ee548020734c22d494087ee080fbce Author: Nick Schermer Date: Fri Mar 30 21:34:35 2012 +0200 Updates for release. NEWS| 11 ++- configure.ac.in |4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 457935b..0983fc9 100644 --- a/NEWS +++ b/NEWS @@ -35,7 +35,16 @@ - Panel: Add confirmation before creating launchers from dnd (bug #6926). - Applicationsmenu: Allow non-squared icons in applications button (bug #7381). - Panel: Save plugin-ids when removing and moving items in ed. -- Translation updates (). +- Tasklist: Bringing back 4.8 max-button-size property. +- Tasklist: Capping buttons height when button labels are visible. +- Tasklist: Reverting "ceil" to "floor" (as in 4.8). +- Actions: Query visibility and save as strings. +- Translation updates: Arabic, Catalan (Valencian), Czech, Danish, + German, Esperanto, Spanish (Castilian), Basque, Finnish, French, + Hebrew, Hungarian, Indonesian, Italian, Kazakh, Korean, Lithuanian, + Dutch (Flemish), Norwegian Nynorsk, Polish, Portuguese, Portuguese + (Brazilian), Russian, Slovak, Telugu, Turkish, Ukrainian, Chinese + (China), Chinese (Taiwan). 4.9.0 = diff --git a/configure.ac.in b/configure.ac.in index 9fbe0db..2d09d63 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,10 +13,10 @@ m4_define([libxfce4panel_version_api], [1.0]) m4_define([xfce4_panel_config_version], [2]) m4_define([xfce4_panel_version_major], [4]) m4_define([xfce4_panel_version_minor], [9]) -m4_define([xfce4_panel_version_micro], [0]) +m4_define([xfce4_panel_version_micro], [1]) 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] Deleting branch nick/poweractions
Deleting branch refs/heads/nick/poweractions ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Actions: Query visibility and save as strings.
Updating branch refs/heads/master
to 1d01534d8e6e3964a589286ae900eb3e713cc44e (commit)
from 8c9397b0a3638d4f7dd3d0eb858faca240c5777e (commit)
commit 1d01534d8e6e3964a589286ae900eb3e713cc44e
Author: Nick Schermer
Date: Sat Dec 3 11:49:58 2011 +0100
Actions: Query visibility and save as strings.
We query the commands and dbus to check if the users is allowed
to preform an action. If not the menu item or button is insensitive.
Also store the actions as strings in xfconf, bit nicer.
migrate/migrate-config.c | 46 ++--
plugins/actions/actions-dialog.glade |2 +
plugins/actions/actions.c| 413 ++
3 files changed, 290 insertions(+), 171 deletions(-)
diff --git a/migrate/migrate-config.c b/migrate/migrate-config.c
index 367e7e4..2c7af1e 100644
--- a/migrate/migrate-config.c
+++ b/migrate/migrate-config.c
@@ -73,34 +73,34 @@ migrate_config_session_menu (gpointer key,
-static gint
+static const gchar *
migrate_config_action_48_convert (gint action)
{
switch (action)
{
case 1: /* ACTION_LOG_OUT_DIALOG */
- return 3; /* ACTION_TYPE_LOGOUT_DIALOG */
+ return "+logout-dialog";
case 2: /* ACTION_LOG_OUT */
- return 2; /* ACTION_TYPE_LOGOUT */
+ return "+logout";
case 3: /* ACTION_LOCK_SCREEN */
- return 5; /* ACTION_TYPE_LOCK_SCREEN */
+ return "+lock-screen";
case 4: /* ACTION_SHUT_DOWN */
- return 9; /* ACTION_TYPE_SHUTDOWN */
+ return "+shutdown";
case 5: /* ACTION_RESTART */
- return 8; /* ACTION_TYPE_RESTART */
+ return "+restart";
case 6: /* ACTION_SUSPEND */
- return 7; /* ACTION_TYPE_SUSPEND */
+ return "+suspend";
case 7: /* ACTION_HIBERNATE */
- return 6; /* ACTION_TYPE_HIBERNATE */
+ return "+hibernate";
default: /* ACTION_DISABLED */
- return -4; /* ACTION_TYPE_SWITCH_USER */
+ return "-switch-user"; /* something else */
}
}
@@ -114,8 +114,10 @@ migrate_config_action_48 (gpointer key,
const GValue *gvalue = value;
const gchar *prop = key;
gchar str[64];
- gint first_action;
- gint second_action;
+ gint first_action_int;
+ gint second_action_int;
+ const gchar *first_action;
+ const gchar *second_action;
/* skip non root plugin properties */
if (!G_VALUE_HOLDS_STRING (gvalue)
@@ -125,18 +127,18 @@ migrate_config_action_48 (gpointer key,
/* read and remove the old properties */
g_snprintf (str, sizeof (str), "%s/first-action", prop);
- first_action = xfconf_channel_get_uint (channel, str, 0) + 1;
+ first_action_int = xfconf_channel_get_uint (channel, str, 0) + 1;
xfconf_channel_reset_property (channel, str, FALSE);
g_snprintf (str, sizeof (str), "%s/second-action", prop);
- second_action = xfconf_channel_get_uint (channel, str, 0);
+ second_action_int = xfconf_channel_get_uint (channel, str, 0);
xfconf_channel_reset_property (channel, str, FALSE);
/* corrections for new plugin */
- if (first_action == 0)
-first_action = 1;
- if (first_action == second_action)
-second_action = 0;
+ if (first_action_int == 0)
+first_action_int = 1;
+ if (first_action_int == second_action_int)
+second_action_int = 0;
/* set appearance to button mode */
g_snprintf (str, sizeof (str), "%s/appearance", prop);
@@ -144,17 +146,17 @@ migrate_config_action_48 (gpointer key,
/* set orientation */
g_snprintf (str, sizeof (str), "%s/invert-orientation", prop);
- xfconf_channel_set_bool (channel, str, second_action > 0);
+ xfconf_channel_set_bool (channel, str, second_action_int > 0);
/* convert the old value to new ones */
- first_action = migrate_config_action_48_convert (first_action);
- second_action = migrate_config_action_48_convert (second_action);
+ first_action = migrate_config_action_48_convert (first_action_int);
+ second_action = migrate_config_action_48_convert (second_action_int);
/* set the visible properties */
g_snprintf (str, sizeof (str), "%s/items", prop);
xfconf_channel_set_array (channel, str,
-G_TYPE_INT, &first_action,
-G_TYPE_INT, &second_action,
+G_TYPE_STRING, &first_action,
+G_TYPE_STRING, &second_action,
G_TYPE_INVALID);
}
diff --git a/plugins/actions/actions-dialog.glade
b/plugins/actions/actions-dialog.glade
index c39d4bb..f2a26cd 100644
--- a/plugins/actions/actions-dialog.glade
+++ b/plugins/actions/actions-dialog.glade
@@ -261,6 +261,8 @@
+
+
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 0e27864..6b08344 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -83,6 +83,7 @@ enum
enum
{
COLUMN_VISIBLE,
+ COLUMN_DISPLAY_NAME,
COLUMN_NAME,
[Xfce4-commits] Tasklist: Reverting "ceil" to "floor" (as in 4.8).
Updating branch refs/heads/master
to 8c9397b0a3638d4f7dd3d0eb858faca240c5777e (commit)
from e733f80b11c61199f7c7ae63d83987706ec734f4 (commit)
commit 8c9397b0a3638d4f7dd3d0eb858faca240c5777e
Author: Andrzej
Date: Tue Mar 6 02:08:00 2012 +0900
Tasklist: Reverting "ceil" to "floor" (as in 4.8).
plugins/tasklist/tasklist-widget.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 7c60dd9..0f1991a 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -771,8 +771,7 @@ xfce_tasklist_size_request (GtkWidget *widget,
rows = MAX (tasklist->nrows, 1);
if (tasklist->show_labels && tasklist->max_button_size > 0)
{
- rows = MAX (rows,
- ceil ((gdouble) tasklist->size / (gdouble)
tasklist->max_button_size));
+ rows = MAX (rows, tasklist->size / tasklist->max_button_size);
child_height = MIN (child_height, tasklist->max_button_size);
}
@@ -847,8 +846,7 @@ xfce_tasklist_size_layout (XfceTasklist *tasklist,
if (xfce_tasklist_deskbar (tasklist) && tasklist->show_labels)
rows = 1;
else if (tasklist->show_labels && tasklist->max_button_size > 0)
-rows = MAX (tasklist->nrows,
-ceil ((gdouble) tasklist->size / (gdouble)
tasklist->max_button_size));
+rows = MAX (tasklist->nrows, tasklist->size / tasklist->max_button_size);
else
rows = tasklist->nrows;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tasklist: Capping buttons height when button labels are visible.
Updating branch refs/heads/master
to e733f80b11c61199f7c7ae63d83987706ec734f4 (commit)
from 42f1ea5f0fb3c64376328cd172e33019511bc1b3 (commit)
commit e733f80b11c61199f7c7ae63d83987706ec734f4
Author: Andrzej
Date: Tue Mar 6 01:29:12 2012 +0900
Tasklist: Capping buttons height when button labels are visible.
plugins/tasklist/tasklist-widget.c | 15 +--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index ec0d035..7c60dd9 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -769,6 +769,12 @@ xfce_tasklist_size_request (GtkWidget *widget,
else
{
rows = MAX (tasklist->nrows, 1);
+ if (tasklist->show_labels && tasklist->max_button_size > 0)
+{
+ rows = MAX (rows,
+ ceil ((gdouble) tasklist->size / (gdouble)
tasklist->max_button_size));
+ child_height = MIN (child_height, tasklist->max_button_size);
+}
cols = n_windows / rows;
if (cols * rows < n_windows)
@@ -840,6 +846,9 @@ xfce_tasklist_size_layout (XfceTasklist *tasklist,
/* if we're in deskbar mode, there are no columns */
if (xfce_tasklist_deskbar (tasklist) && tasklist->show_labels)
rows = 1;
+ else if (tasklist->show_labels && tasklist->max_button_size > 0)
+rows = MAX (tasklist->nrows,
+ceil ((gdouble) tasklist->size / (gdouble)
tasklist->max_button_size));
else
rows = tasklist->nrows;
@@ -850,7 +859,9 @@ xfce_tasklist_size_layout (XfceTasklist *tasklist,
if (cols * rows < tasklist->n_windows)
cols++;
- if (xfce_tasklist_deskbar (tasklist) || !tasklist->show_labels)
+ if (xfce_tasklist_deskbar (tasklist) && tasklist->show_labels)
+min_button_length = MIN (alloc->height / tasklist->nrows,
tasklist->max_button_size);
+ else if (!tasklist->show_labels)
min_button_length = alloc->height / tasklist->nrows;
else
min_button_length = tasklist->min_button_length;
@@ -1036,7 +1047,7 @@ xfce_tasklist_size_allocate (GtkWidget *widget,
if (xfce_tasklist_deskbar (tasklist) && tasklist->show_labels)
{
/* fixed width is OK because area.width==w*cols */
- w = area.height / tasklist->nrows;
+ w = MIN (area.height / tasklist->nrows,
tasklist->max_button_size);
}
else if (tasklist->show_labels)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tasklist: Bringing back 4.8 max-button-size property.
Updating branch refs/heads/master
to 42f1ea5f0fb3c64376328cd172e33019511bc1b3 (commit)
from df719a5472c7ce2a9fc42aa970b68b7218a03896 (commit)
commit 42f1ea5f0fb3c64376328cd172e33019511bc1b3
Author: Andrzej
Date: Tue Mar 6 00:42:19 2012 +0900
Tasklist: Bringing back 4.8 max-button-size property.
plugins/tasklist/tasklist-widget.c | 16
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 934ed7e..ec0d035 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -44,6 +44,7 @@
+#define DEFAULT_BUTTON_SIZE (25)
#define DEFAULT_MAX_BUTTON_LENGTH(200)
#define DEFAULT_MENU_ICON_SIZE (16)
#define DEFAULT_MIN_BUTTON_LENGTH(DEFAULT_MAX_BUTTON_LENGTH / 4)
@@ -186,6 +187,7 @@ struct _XfceTasklist
/* gtk style properties */
gint max_button_length;
gint min_button_length;
+ gint max_button_size;
PangoEllipsizeModeellipsize_mode;
gint minimized_icon_lucency;
gint menu_icon_size;
@@ -475,6 +477,14 @@ xfce_tasklist_class_init (XfceTasklistClass *klass)
EXO_PARAM_READABLE));
gtk_widget_class_install_style_property (gtkwidget_class,
+ g_param_spec_int ("max-button-size",
+ NULL,
+ "The maximum size
of a window button",
+ 1, G_MAXINT,
+
DEFAULT_BUTTON_SIZE,
+
EXO_PARAM_READABLE));
+
+ gtk_widget_class_install_style_property (gtkwidget_class,
g_param_spec_enum ("ellipsize-mode",
NULL,
"The ellipsize
mode used for the button label",
@@ -534,6 +544,7 @@ xfce_tasklist_init (XfceTasklist *tasklist)
tasklist->update_monitor_geometry_id = 0;
tasklist->max_button_length = DEFAULT_MAX_BUTTON_LENGTH;
tasklist->min_button_length = DEFAULT_MIN_BUTTON_LENGTH;
+ tasklist->max_button_size = DEFAULT_BUTTON_SIZE;
tasklist->minimized_icon_lucency = DEFAULT_ICON_LUCENCY;
tasklist->ellipsize_mode = DEFAULT_ELLIPSIZE_MODE;
tasklist->grouping = XFCE_TASKLIST_GROUPING_DEFAULT;
@@ -1091,6 +1102,7 @@ xfce_tasklist_style_set (GtkWidget *widget,
{
XfceTasklist *tasklist = XFCE_TASKLIST (widget);
gint max_button_length;
+ gint max_button_size;
gint min_button_length;
gint w, h;
@@ -1102,6 +1114,7 @@ xfce_tasklist_style_set (GtkWidget *widget,
"max-button-length", &max_button_length,
"min-button-length", &min_button_length,
"ellipsize-mode", &tasklist->ellipsize_mode,
+"max-button-size", &max_button_size,
"minimized-icon-lucency",
&tasklist->minimized_icon_lucency,
"menu-max-width-chars",
&tasklist->menu_max_width_chars,
NULL);
@@ -,6 +1124,7 @@ xfce_tasklist_style_set (GtkWidget *widget,
/* update the widget */
if (tasklist->max_button_length != max_button_length
+ || tasklist->max_button_size != max_button_size
|| tasklist->min_button_length != min_button_length)
{
if (max_button_length > 0)
@@ -1125,6 +1139,8 @@ xfce_tasklist_style_set (GtkWidget *widget,
tasklist->min_button_length = min_button_length;
}
+ tasklist->max_button_size = max_button_size;
+
gtk_widget_queue_resize (widget);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix return value of CanSuspend and CanHibernate.
Updating branch refs/heads/master to 1b21ed4a608109b16aad100e9759a96815d4e162 (commit) from b46f75c3dac2bfc8c6bdcd858ba450aa011f9f13 (commit) commit 1b21ed4a608109b16aad100e9759a96815d4e162 Author: Nick Schermer Date: Fri Mar 30 21:29:16 2012 +0200 Fix return value of CanSuspend and CanHibernate. xfce4-session/xfsm-manager.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c index 2e244d9..d457eca 100644 --- a/xfce4-session/xfsm-manager.c +++ b/xfce4-session/xfsm-manager.c @@ -2111,7 +2111,7 @@ xfsm_manager_dbus_can_suspend (XfsmManager *manager, can_suspend, &auth_suspend, error); if (!auth_suspend) -can_suspend = FALSE; +*can_suspend = FALSE; return retval; } @@ -2138,7 +2138,7 @@ xfsm_manager_dbus_can_hibernate (XfsmManager *manager, can_hibernate, &auth_hibernate, error); if (!auth_hibernate) -can_hibernate = FALSE; +*can_hibernate = FALSE; return retval; } ___ 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 10e864485fb4abdcc3d9567fcf0c4eae41c07eee (commit) from 4c3e6769b6092785c4c0637392f99e58109d8273 (commit) commit 10e864485fb4abdcc3d9567fcf0c4eae41c07eee Author: Nick Schermer Date: Fri Mar 30 21:00:09 2012 +0200 Updates for release. NEWS| 977 +++ configure.ac.in |4 +- 2 files changed, 485 insertions(+), 496 deletions(-) diff --git a/NEWS b/NEWS index e2be784..533ced7 100644 --- a/NEWS +++ b/NEWS @@ -1,317 +1,311 @@ -Xfdesktop 4.9.0 - - * Drop AC_PROG_LIBTOOL for LT_PREREQ and LT_INIT. - * Remove docs and link to wiki. - * Thumbnail desktop icon previews using tumblerd. - * Added a check for GDK_GRAB_INVALID_TIME in -xfdesktop_popup_grab_available to mitigate slow menu popups on -a right mouse click (bug #7172). - * Add the code required to perform a paste on the on the desktop -(bug #3804). - * Display correct trash icon on menu & desktop. - * Fix for shift + drag selections/ - * Icon positions are saved/restored per resolution. - * Backdrop image cycling on a timer. - * Modified xfdesktop_icon_view_drag_drop to allow all -selected files to drag and drop (bug #5025). - * Fix for moving files instead of copy when src isn't writable. - * Fix typos in the README file. - * Unmounted volumes are semi-transparent. - * Stretch background across all monitors setting (bug #5690). - * Arrange icons on the desktop menu item (bug #2833). - * Single click option to open items on desktop (bug #1797). - * Require libexo & update min requirements in readme. - * Comments in .desktop files are displayed in the tooltip (bug #8509). - - -Xfdesktop 4.8.3 - * Fix moving files to the desktop via shift & drag (bug #7629). -Reported and fixed by Patrick Melo. - * Translation updates: Korean, Malay, Russian, Spanish (Castilian), -Slovak, Telugu, German, Dutch (Flemish), Basque, -Portuguese (Brazilian). - - -Xfdesktop 4.8.2 - * Fix a crash on focus in when items are selected (bug #7313). -Reported and fixed by Ambroz Bizjak. - * Retrieve the translated desktop file name. - * Fix potential crash in xfdesktop-settings (bug #7301). - * Fix creation of empty file from template menu (bug #7230). - * Stop altering the root window pixmap to avoid X crash (bug #7442). - * Translation updates: Ukrainian, Turkish, Lithuanian, Swedish, -Danish, Chinese, Romanian, Kazakh. - - -Xfdesktop 4.8.1 - - * Use Name field as display name of desktop files (bug #6896). - * Support absolute icon paths in desktop files (bug #7160). -Patch by xai...@gmail.com. - * Scroll to the selected background in the settings (bug #7087). - * Handle volume changes in a timeout (bug #7025). - * Implement monitoring for special file icons (bug #6986). - * Implement open and empty actions for the trash. - * Fix crash when cancelling a file download (bug #6876). - * Properly invalidate tooltips on file changes. - * Make sure the background is reloaded on compositing changes. - * Translation updates: Catalan (Valencian), English (United Kingdom), -Finnish, French, Galician, German, Greek, Hungarian, Italian, -Japanese, Portuguese, Romanian, Russian, Swedish. - - -Xfdesktop 4.8.0 - - * Optipng the backgrops. - * Drop the flower background. - * Translation updates: Arabic, Croatian, French, Greek, Polish, -Portuguese, Romanian. - - -Xfdesktop 4.7.5 - - * Work around Gtk 2.16 function (bug #6883). - * Translation updates: sk, ru, cs, en_GB, lt, sv, nb, ar, pt). - - -Xfdesktop 4.7.4 - - * Add checks for an API change in libnotify 0.7.0 (bug #6915). - * Avoid GTK+ 2.18 and GIO 2.20 function calls (or at least guard them -so that xfdesktop still builds with older versions). - * Let garcon choose the default applications menu file using -XDG_MENU_PREFIX. Drop the UserMenu kiosk option as the panel -sort of allows to bypass it anyway. - - -Xfdesktop 4.7.3 - - * Fix a crash caused by accessing the wrong variable when adding -items to the right-click menu. - * Select the correct icon style in the desktop settings on first -start (bug #6798). - * Depend on libwnck >= 2.22 so we no longer have to implement hacks -for the two different "active-workspace-changed" signal variants -in libwnck (bug #6638). - * Add menu item monitoring. - * Fix critical when session manager is not running (bug #6822). - * Remove checks for older GLib/GTK+ versions that are no longer needed. - * Allow workspace names that start with a number (bug #6318). - * Delay notification initialization until we show one. - * Set the correct session priority. - * Do not call gtk_widget_show() on menus (bug #6198). - * Translation updates: gl, ca, de, it, kk, fi, sk, pt, uk, el, -zh_TW, da, id, eu, hu, lt. - - -Xfdesktop
[Xfce4-commits] Creating annotated tag xfdesktop-4.9.1
Updating annotated tag refs/tags/xfdesktop-4.9.1 as new annotated tag to 3341330b6e3bcd069ac55f2c38e059653bfd4073 (tag) succeeds xfdesktop-4.9.0-34-g4c3e676 tagged by Nick Schermer on 2012-03-30 21:01 +0200 Nick Schermer (1): Updates for release. ___ 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 e6cac3b986b4468141f5f8f021dac834c9621434 (commit) from 10e864485fb4abdcc3d9567fcf0c4eae41c07eee (commit) commit e6cac3b986b4468141f5f8f021dac834c9621434 Author: Nick Schermer Date: Fri Mar 30 21:01:23 2012 +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 f70eb76..76583eb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ m4_define([xfdesktop_version_minor], [9]) m4_define([xfdesktop_version_micro], [1]) m4_define([xfdesktop_version_nano], []) m4_define([xfdesktop_version_build], [@REVISION@]) -m4_define([xfdesktop_version_tag],[]) +m4_define([xfdesktop_version_tag],[git]) m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) dnl minimum required versions ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-session-4.9.0
Updating annotated tag refs/tags/xfce4-session-4.9.0 as new annotated tag to 467e36dc66e26d11e8e9b588c1984ab5ac908425 (tag) succeeds xfce4-session-4.8.0-315-g266b6c3 tagged by Nick Schermer on 2012-03-30 20:48 +0200 Nick Schermer (1): Updates for release. ___ 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 b46f75c3dac2bfc8c6bdcd858ba450aa011f9f13 (commit) from 362ceffe47df780d777fa8f0bf5c5207a2586ad3 (commit) commit b46f75c3dac2bfc8c6bdcd858ba450aa011f9f13 Author: Nick Schermer Date: Fri Mar 30 20:49:26 2012 +0200 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index db2a0a8..1e97cbd 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,7 +11,7 @@ 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@]) -m4_define([xfsm_version_tag], []) +m4_define([xfsm_version_tag], [git]) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) ___ 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 362ceffe47df780d777fa8f0bf5c5207a2586ad3 (commit) from 266b6c376a6563fbe0c79333eb35723f6a79959f (commit) commit 362ceffe47df780d777fa8f0bf5c5207a2586ad3 Author: Nick Schermer Date: Fri Mar 30 20:47:24 2012 +0200 Updates for release. .gitignore |1 - Makefile.am |1 - NEWS|8 +++- configure.in.in |2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83077af..946efed 100644 --- a/.gitignore +++ b/.gitignore @@ -57,7 +57,6 @@ stamp-h1 xfce.desktop xfce4-session-logout/xfce4-session-logout xfce4-session-logout/xfce4-session-logout.desktop -xfce4-session.spec xfce4-session/chooser-icon.h xfce4-session/stamp-xfsm-marshal.h xfce4-session/xfce4-session diff --git a/Makefile.am b/Makefile.am index a1d3398..7825ae1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,6 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - xfce4-session.spec \ $(config_DATA) \ $(desktop_in_files) diff --git a/NEWS b/NEWS index c744a85..175be7e 100644 --- a/NEWS +++ b/NEWS @@ -28,7 +28,13 @@ - Remove unused icons. - Show all applications in autostart (bug #8014). - Drop gpg-agent and ssh-agent handling. -- Translation updates (). +- Translation updates: Arabic, Bulgarian, Catalan (Valencian), Czech, + Danish, German, Greek, Spanish (Castilian), Basque, Finnish, French, + Galician, Croatian, Hungarian, Indonesian, Icelandic, Italian, + Kazakh, Korean, Lithuanian, Dutch (Flemish), Norwegian Nynorsk, + Polish, Portuguese, Portuguese (Brazilian), Romanian, Russian, + Slovak, Swedish, Telugu, Turkish, Ukrainian, Chinese (China), Chinese + (Taiwan). 4.8.2 (not released yet) = diff --git a/configure.in.in b/configure.in.in index 1e97cbd..db2a0a8 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,7 +11,7 @@ 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@]) -m4_define([xfsm_version_tag], [git]) +m4_define([xfsm_version_tag], []) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve tiling
Updating branch refs/heads/master
to 8d887c6b7e5b48c0e26eb49409022f5bd78ed89a (commit)
from b96857d8677627bae2e687326c90d28e7033915b (commit)
commit 8d887c6b7e5b48c0e26eb49409022f5bd78ed89a
Author: Olivier Fourdan
Date: Fri Mar 30 20:43:41 2012 +0200
Improve tiling
defaults/defaults |1 +
src/client.c | 206 ++---
src/client.h |7 +-
src/main.c|4 +-
src/moveresize.c | 96 ++--
src/settings.c|7 ++
src/settings.h|3 +-
7 files changed, 188 insertions(+), 136 deletions(-)
diff --git a/defaults/defaults b/defaults/defaults
index 1d7c97d..56eaf40 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -50,6 +50,7 @@ snap_to_border=true
snap_to_windows=false
snap_width=10
theme=Default
+tile_on_move=false
title_alignment=center
title_font=Sans Bold 9
title_horizontal_offset=0
diff --git a/src/client.c b/src/client.c
index de741a6..44f69f9 100644
--- a/src/client.c
+++ b/src/client.c
@@ -106,12 +106,12 @@ struct _ButtonPressData
/* Forward decl */
static void
-clientUpdateIconPix (Client * c);
-static void
-clientNewMaxSize (Client * c, XWindowChanges *wc, GdkRectangle *,
tilePositionType tile);
+clientUpdateIconPix (Client *c);
+static gboolean
+clientNewMaxSize (Client *c, XWindowChanges *wc, GdkRectangle *,
tilePositionType tile);
Display *
-clientGetXDisplay (Client * c)
+clientGetXDisplay (Client *c)
{
g_return_val_if_fail (c, NULL);
@@ -119,7 +119,7 @@ clientGetXDisplay (Client * c)
}
void
-clientInstallColormaps (Client * c)
+clientInstallColormaps (Client *c)
{
XWindowAttributes attr;
gboolean installed;
@@ -148,7 +148,7 @@ clientInstallColormaps (Client * c)
}
void
-clientUpdateColormaps (Client * c)
+clientUpdateColormaps (Client *c)
{
g_return_if_fail (c != NULL);
TRACE ("entering clientUpdateColormaps");
@@ -166,7 +166,7 @@ clientUpdateColormaps (Client * c)
}
static gchar*
-clientCreateTitleName (Client * c, gchar *name, gchar *hostname)
+clientCreateTitleName (Client *c, gchar *name, gchar *hostname)
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
@@ -192,7 +192,7 @@ clientCreateTitleName (Client * c, gchar *name, gchar
*hostname)
}
void
-clientUpdateName (Client * c)
+clientUpdateName (Client *c)
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
@@ -314,7 +314,7 @@ clientUpdateAllFrames (ScreenInfo *screen_info, int mask)
}
void
-clientGrabButtons (Client * c)
+clientGrabButtons (Client *c)
{
ScreenInfo *screen_info;
@@ -330,7 +330,7 @@ clientGrabButtons (Client * c)
}
void
-clientUngrabButtons (Client * c)
+clientUngrabButtons (Client *c)
{
g_return_if_fail (c != NULL);
TRACE ("entering clientUngrabButtons");
@@ -442,7 +442,7 @@ clientUpdateUrgency (Client *c)
}
void
-clientCoordGravitate (Client * c, int gravity, int mode, int *x, int *y)
+clientCoordGravitate (Client *c, int gravity, int mode, int *x, int *y)
{
int dx, dy;
@@ -503,7 +503,7 @@ clientCoordGravitate (Client * c, int gravity, int mode,
int *x, int *y)
}
void
-clientAdjustCoordGravity (Client * c, int gravity, unsigned long *mask,
XWindowChanges *wc)
+clientAdjustCoordGravity (Client *c, int gravity, unsigned long *mask,
XWindowChanges *wc)
{
int tx, ty, dw, dh;
@@ -583,7 +583,7 @@ clientAdjustCoordGravity (Client * c, int gravity, unsigned
long *mask, XWindowC
#define WIN_RESIZED (mask & (CWWidth | CWHeight))
static void
-clientConfigureWindows (Client * c, XWindowChanges * wc, unsigned long mask,
unsigned short flags)
+clientConfigureWindows (Client *c, XWindowChanges * wc, unsigned long mask,
unsigned short flags)
{
unsigned long change_mask_frame, change_mask_client;
XWindowChanges change_values;
@@ -630,7 +630,7 @@ clientConfigureWindows (Client * c, XWindowChanges * wc,
unsigned long mask, uns
}
void
-clientConfigure (Client * c, XWindowChanges * wc, unsigned long mask, unsigned
short flags)
+clientConfigure (Client *c, XWindowChanges * wc, unsigned long mask, unsigned
short flags)
{
XConfigureEvent ce;
int px, py, pwidth, pheight;
@@ -794,7 +794,7 @@ clientConfigure (Client * c, XWindowChanges * wc, unsigned
long mask, unsigned s
}
void
-clientMoveResizeWindow (Client * c, XWindowChanges * wc, unsigned long mask)
+clientMoveResizeWindow (Client *c, XWindowChanges * wc, unsigned long mask)
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
@@ -818,7 +818,7 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc,
unsigned long mask)
/* Not allowed in fullscreen or maximzed mode */
mask &= ~(CWX | CWY | CWWidth | CWHeight);
}
-/* Clean up buggy requests that set all flags */
+/*clean up buggy requests that set all flags */
if ((mask & CWX) && (wc->x == c->x))
{
mask &= ~CWX;
@@ -851,7 +851,7 @@ clientMoveResizeWindow (Client * c,
[Xfce4-commits] Creating annotated tag xfwm4-4.9.0
Updating annotated tag refs/tags/xfwm4-4.9.0 as new annotated tag to 699ab46853dacc665158364d88d50f1d750b7aa5 (tag) succeeds xfwm4-4.8.0-238-g41e7d1d tagged by Nick Schermer on 2012-03-30 20:44 +0200 Nick Schermer (1): Updates for release. ___ 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 b96857d8677627bae2e687326c90d28e7033915b (commit) from 40bac186e7625d93e364662cc644d3f8eb53821b (commit) commit b96857d8677627bae2e687326c90d28e7033915b Author: Nick Schermer Date: Fri Mar 30 20:43:16 2012 +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 6cc0f22..123978d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [9]) m4_define([xfwm4_version_micro], [0]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], []) +m4_define([xfwm4_version_tag], [git]) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ 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 40bac186e7625d93e364662cc644d3f8eb53821b (commit) from 41e7d1d3d909289fb1c7ea3bfac146247f1cc672 (commit) commit 40bac186e7625d93e364662cc644d3f8eb53821b Author: Nick Schermer Date: Fri Mar 30 20:41:55 2012 +0200 Updates for release. NEWS| 12 +++- configure.ac.in |2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2accbbb..f441022 100644 --- a/NEWS +++ b/NEWS @@ -29,7 +29,17 @@ more predictable. - Get rid or of old GNOME 1.x protocol. - Get rif of legacy fullscreen emulation. -- Translation updates (). +- Translation updates: Amharic, Arabic, Asturian, Azerbaijani, + Belarusian, Bulgarian, Bengali, Bengali (India), Catalan (Valencian), + Czech, Danish, German, Dzongkha, Greek, English (United Kingdom), + Esperanto, Spanish (Castilian), Estonian, Basque, Persian, Finnish, + French, Galician, Gujarati, Hebrew, Hindi, Croatian, Hungarian, + Indonesian, Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, + Lithuanian, Latvian, Macedonian, Marathi, Malay, Norwegian Bokmal, + Dutch (Flemish), Norwegian Nynorsk, Panjabi (Punjabi), Polish, + Portuguese, Portuguese (Brazilian), Romanian, Russian, Sinhala, + Slovak, Albanian, Swedish, Tamil, Telugu, Turkish, Uyghur, Ukrainian, + Urdu, Urdu (Pakistan), Vietnamese, Chinese (China), Chinese (Taiwan). 4.8.x diff --git a/configure.ac.in b/configure.ac.in index 123978d..6cc0f22 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [9]) m4_define([xfwm4_version_micro], [0]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], [git]) +m4_define([xfwm4_version_tag], []) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add a bunch of redirects.
Updating branch refs/heads/master to adbd98c46731723601f6f9250c24df7277f8c6e8 (commit) from addc4ef80643c980586c9d2a3c911a78674688d0 (commit) commit adbd98c46731723601f6f9250c24df7277f8c6e8 Author: Nick Schermer Date: Fri Mar 30 20:35:04 2012 +0200 Add a bunch of redirects. .htaccess | 24 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess index 1a8fa9c..9e032e8 100755 --- a/.htaccess +++ b/.htaccess @@ -13,6 +13,30 @@ Redirect 301 /community/lists http://www.xfce.org/community Redirect 301 /development http://www.xfce.org/getinvolved Redirect 301 /archive http://archive.xfce.org +Redirect 301 /projects/xfwm4 http://docs.xfce.org/xfce/xfwm4/ +Redirect 301 /projects/terminal http://docs.xfce.org/apps/terminal/ +Redirect 301 /projects/xfce4-panel http://docs.xfce.org/xfce/xfce4-panel/ +Redirect 301 /projects/xfce4-session http://docs.xfce.org/xfce/xfce4-session/ +Redirect 301 /projects/xfce4-settings http://docs.xfce.org/xfce/xfce4-settings/ +Redirect 301 /projects/xfce-mcs-manager http://docs.xfce.org/xfce/xfce4-settings/ +Redirect 301 /projects/libraries http://docs.xfce.org/xfce/exo/ +Redirect 301 /projects/xfdesktop http://docs.xfce.org/xfce/xfdesktop/ +Redirect 301 /projects/xfce4-appfinder http://docs.xfce.org/xfce/xfce4-appfinder/ +Redirect 301 /projects/thunar http://docs.xfce.org/xfce/thunar/ +Redirect 301 /download/building http://docs.xfce.org/xfce/building +Redirect 301 /download/distros http://www.xfce.org/download + +Redirect 301 /release_notes/4.4rc1_changelog.html http://www.xfce.org/download/changelogs/4.3.99.1 +Redirect 301 /release_notes/4.2.3.1_changelog.html http://www.xfce.org/download/changelogs/4.2.3.1 +Redirect 301 /release_notes/4.4beta2_changelog.txt http://www.xfce.org/download/changelogs/4.3.90.2 +Redirect 301 /release_notes/4.2.0_changelog.html http://www.xfce.org/download/changelogs/4.2.0 +Redirect 301 /release_notes/4.4rc2_changelog.html http://www.xfce.org/download/changelogs/4.3.99.2 +Redirect 301 /release_notes/4.2.0_press_announcement.html http://www.xfce.org/download/changelogs/4.2.0 +Redirect 301 /release_notes/4.2.1_changelog.html http://www.xfce.org/download/changelogs/4.2.1 +Redirect 301 /release_notes/4.1.x_changelog.html http://www.xfce.org/download/changelogs/4.2.1 +Redirect 301 /release_notes/4.2.2_changelog.html http://www.xfce.org/download/changelogs/4.2.2 +Redirect 301 /release_notes/4.2_changelog.html http://www.xfce.org/download/changelogs/4.2.0 + # for correcting the version number style Redirect 301 /download/changelogs/4.8 http://www.xfce.org/download/changelogs/4.8.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-settings-4.9.3
Updating annotated tag refs/tags/xfce4-settings-4.9.3 as new annotated tag to 2c8c873e03dc2f164d8e0b5c0591723ea28dcdaa (tag) succeeds xfce4-settings-4.9.2-51-g2dd91f4 tagged by Nick Schermer on 2012-03-30 20:32 +0200 Nick Schermer (1): Updates for release. ___ 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 2b7b2da60731d1eb9e68443d4cb8ce9d67ceea05 (commit) from 65a3ffcab7698e80120f686abd55e03537920620 (commit) commit 2b7b2da60731d1eb9e68443d4cb8ce9d67ceea05 Author: Nick Schermer Date: Fri Mar 30 20:32:45 2012 +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 330324b..4fd2f97 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -14,7 +14,7 @@ m4_define([xfce4_settings_version_minor], [9]) m4_define([xfce4_settings_version_micro], [3]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], []) # Leave empty for releases +m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_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/master to 65a3ffcab7698e80120f686abd55e03537920620 (commit) from 2dd91f404509dc3a1964c736e1fd9d1461703154 (commit) commit 65a3ffcab7698e80120f686abd55e03537920620 Author: Nick Schermer Date: Fri Mar 30 20:30:30 2012 +0200 Updates for release. NEWS|5 - configure.ac.in |4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1a299e5..cbddc3c 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,10 @@ - Complete theme installation script. - Settings editor: Set sensitivity of save button on init. - Xfsettingsd: Properly round display refresh rate to find match. -- Translation updates (). +- Translation updates: Arabic, Catalan (Valencian), Czech, Danish, + German, Spanish (Castilian), Basque, French, Indonesian, Korean, + Lithuanian, Portuguese, Russian, Slovak, Swedish, Telugu, Turkish, + Chinese (China), Chinese (Taiwan).wan). 4.9.2 = diff --git a/configure.ac.in b/configure.ac.in index 7603335..330324b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,10 +11,10 @@ dnl *** Version information *** dnl *** m4_define([xfce4_settings_version_major], [4]) m4_define([xfce4_settings_version_minor], [9]) -m4_define([xfce4_settings_version_micro], [2]) +m4_define([xfce4_settings_version_micro], [3]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases +m4_define([xfce4_settings_version_tag], []) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove exo dependency
Updating branch refs/heads/master
to 21087fcb542b48552312b238c026a4de854d22df (commit)
from 08099d83701a4b9ab74657147af5ffe0192246ac (commit)
commit 21087fcb542b48552312b238c026a4de854d22df
Author: Stephan Arts
Date: Tue Feb 28 07:45:41 2012 +0100
Remove exo dependency
configure.in.in |2 --
src/Makefile.am |1 +
src/{util.c => db.c} |5 ++---
src/{util.c => db.h} | 12 +++-
src/util.c |1 -
src/util.h | 10 ++
6 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 7795e08..310f9c2 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -61,8 +61,6 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.4.0])
-
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.8.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index 513ec83..e86d739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ ristretto_SOURCES = \
file.c file.h \
privacy_dialog.h privacy_dialog.c \
util.c util.h \
+ db.c db.h \
icon_bar.c icon_bar.h \
main.c
diff --git a/src/util.c b/src/db.c
similarity index 89%
copy from src/util.c
copy to src/db.c
index 9150762..9989850 100644
--- a/src/util.c
+++ b/src/db.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) Stephan Arts 2011
+ * Copyright (c) Stephan Arts 2012
*
* 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
@@ -19,6 +19,5 @@
#include
#include
#include
-#include
-#include "util.h"
+#include "db.h"
diff --git a/src/util.c b/src/db.h
similarity index 87%
copy from src/util.c
copy to src/db.h
index 9150762..3d59cdd 100644
--- a/src/util.c
+++ b/src/db.h
@@ -16,9 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include
-#include
-#include
-#include
+#ifndef __RISTRETTO_DB_H__
+#define __RISTRETTO_DB_H__
-#include "util.h"
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#endif /* __RSTTO_DB_H__ */
diff --git a/src/util.c b/src/util.c
index 9150762..8179a37 100644
--- a/src/util.c
+++ b/src/util.c
@@ -19,6 +19,5 @@
#include
#include
#include
-#include
#include "util.h"
diff --git a/src/util.h b/src/util.h
index 64e405e..9d585f0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -67,4 +67,14 @@ typedef enum {
THUMBNAIL_SIZE_COUNT,
} RsttoThumbnailSize;
+#define THUMBNAIL_SIZE_VERY_SMALL_SIZE 24
+#define THUMBNAIL_SIZE_SMALLER_SIZE 32
+#define THUMBNAIL_SIZE_SMALL_SIZE48
+#define THUMBNAIL_SIZE_NORMAL_SIZE 64
+#define THUMBNAIL_SIZE_LARGE_SIZE96
+#define THUMBNAIL_SIZE_LARGER_SIZE 128
+#define THUMBNAIL_SIZE_VERY_LARGE_SIZE 256
+
+G_END_DECLS
+
#endif /* __RSTTO_UTIL_H__ */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add edit-button
Updating branch refs/heads/master
to ecd7144ac6e13fcfc4beb49518018bcea130547f (commit)
from fce0d6e6a5aeecbe1a798227821dafded7a5efc5 (commit)
commit ecd7144ac6e13fcfc4beb49518018bcea130547f
Author: Stephan Arts
Date: Fri Jan 27 22:29:45 2012 +0100
Add edit-button
src/main_window.c | 36 +---
src/main_window_ui.xml |3 ++-
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index 7aae06d..cfb410f 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -193,6 +193,8 @@ 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_edit (GtkWidget *widget, RsttoMainWindow *window);
+static void
cb_rstto_main_window_save_copy (GtkWidget *widget, RsttoMainWindow *window);
static void
cb_rstto_main_window_delete (GtkWidget *widget, RsttoMainWindow *window);
@@ -335,6 +337,7 @@ static GtkActionEntry action_entries[] =
{ "open", "document-open", N_ ("_Open"), "O", N_ ("Open an image"),
G_CALLBACK (cb_rstto_main_window_open_image), },
{ "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), },
+ { "edit", GTK_STOCK_EDIT, N_ ("_Edit"), NULL, N_ ("Edit this image"),
G_CALLBACK (cb_rstto_main_window_edit), },
{ "close", GTK_STOCK_CLOSE, N_ ("_Close"), "W", N_ ("Close this
image"), G_CALLBACK (cb_rstto_main_window_close), },
{ "quit", GTK_STOCK_QUIT, N_ ("_Quit"), "Q", N_ ("Quit Ristretto"),
G_CALLBACK (cb_rstto_main_window_quit), },
/* Edit Menu */
@@ -1308,7 +1311,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/* Toolbar */
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/save-copy"), FALSE);
-gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/close"), FALSE);
+gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/edit"), FALSE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/delete"), FALSE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/forward"), FALSE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/back"), FALSE);
@@ -1439,7 +1442,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/* Toolbar */
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/save-copy"), TRUE);
-gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/close"), TRUE);
+gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/edit"), TRUE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/delete"), TRUE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/forward"), FALSE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/back"), FALSE);
@@ -1542,7 +1545,7 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
/* Toolbar */
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/save-copy"), TRUE);
-gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/close"), TRUE);
+gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/edit"), TRUE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/delete"), TRUE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/zoom-in"), TRUE);
gtk_widget_set_sensitive (gtk_ui_manager_get_widget
(window->priv->ui_manager, "/file-toolbar/zoom-out"), TRUE);
@@ -3264,6 +3267,33 @@ cb_rstto_main_window_close (
}
/**
+ * cb_rstto_main_window_edit:
+ * @widget:
+ * @window:
+ *
+ * Edit images.
+ *
+ */
+static void
+cb_rstto_main_window_edit (
+GtkWidget *widget,
+RsttoMainWindow *window)
+{
+RsttoFile *r_file = rstto_image_list_iter_get_file(window->priv->iter);
+gchar *content_type = rstto_file_get_content_type (r_file);
+GList *app_infos = g_app_info_get_all_for_type (content_type);
+GList *iter = app_infos;
+
+while (iter)
+{
+g_debug("N:
[Xfce4-commits] Implement rudimentary support for image-editor dialog
Updating branch refs/heads/master
to ece295739705d1e6fa824062f58d6eeaa70e9dbf (commit)
from f1bb06c3cb065c449e82b20cb75e8104d7421730 (commit)
commit ece295739705d1e6fa824062f58d6eeaa70e9dbf
Author: Stephan Arts
Date: Fri Mar 30 20:30:08 2012 +0200
Implement rudimentary support for image-editor dialog
src/main_window.c | 81 +++-
1 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index edef1fa..5c37477 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -2876,17 +2876,29 @@ cb_rstto_main_window_edit (
const gchar *content_type = rstto_file_get_content_type (r_file);
const gchar *editor = rstto_mime_db_lookup (window->priv->db,
content_type);
GList *files = g_list_prepend (NULL, rstto_file_get_file (r_file));
+GList *app_infos = NULL;
+GList *app_infos_iter = NULL;
GDesktopAppInfo *app_info = NULL;
+GtkCellRenderer*renderer;
GtkWidget *dialog = NULL;
GtkWidget *content_area;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *image;
GtkWidget *label;
+GtkWidget *check_button;
GtkWidget *treeview;
GtkWidget *scrolled_window;
+GtkListStore *list_store;
+GtkTreeIter iter;
+GtkTreeSelection *selection;
gchar *label_text = NULL;
+const gchar *icon;
+const gchar *id;
+const gchar *name;
+const GdkPixbuf *pixbuf;
+
if ( editor != NULL )
{
app_info = g_desktop_app_info_new (editor);
@@ -2901,7 +2913,7 @@ cb_rstto_main_window_edit (
dialog = gtk_dialog_new_with_buttons (
_("Edit with"),
GTK_WINDOW (window),
-GTK_DIALOG_DESTROY_WITH_PARENT,
+GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
@@ -2914,8 +2926,60 @@ cb_rstto_main_window_edit (
image = gtk_image_new_from_icon_name (content_type, GTK_ICON_SIZE_DIALOG);
label_text = g_strdup_printf (_("Open %s and other files of type %s
with:"), rstto_file_get_display_name (r_file), content_type);
label = gtk_label_new (label_text);
+check_button = gtk_check_button_new_with_mnemonic(_("Use as _default for
this kind of file"));
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
treeview = gtk_tree_view_new ();
+list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_OBJECT);
+
+gtk_tree_view_set_headers_visible (
+GTK_TREE_VIEW (treeview),
+FALSE);
+gtk_tree_view_set_model (
+GTK_TREE_VIEW (treeview),
+GTK_TREE_MODEL (list_store));
+
+renderer = gtk_cell_renderer_pixbuf_new();
+gtk_tree_view_insert_column_with_attributes (
+GTK_TREE_VIEW (treeview),
+0,"", renderer, "pixbuf", 0, NULL);
+
+renderer = gtk_cell_renderer_text_new ();
+gtk_tree_view_insert_column_with_attributes (
+GTK_TREE_VIEW (treeview),
+1,"", renderer, "text", 1, NULL);
+
+app_infos = g_app_info_get_all_for_type (content_type);
+app_infos_iter = app_infos;
+
+while (app_infos_iter)
+{
+id = g_app_info_get_id (app_infos_iter->data);
+
+/* Do not add ristretto to the list */
+if (strcmp (id, "ristretto.desktop"))
+{
+icon = g_icon_to_string (g_app_info_get_icon
(app_infos_iter->data));
+
+pixbuf = gtk_icon_theme_load_icon (
+gtk_icon_theme_get_default (),
+icon,
+36,
+GTK_ICON_LOOKUP_FORCE_SIZE,
+NULL);
+
+name = g_app_info_get_display_name (app_infos_iter->data),
+
+gtk_list_store_append (list_store, &iter);
+
+gtk_list_store_set (list_store, &iter,
+0, pixbuf,
+1, name,
+2, app_infos_iter->data,
+-1);
+}
+app_infos_iter = g_list_next (app_infos_iter);
+}
+
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -2926,13 +2990,26 @@ cb_rstto_main_window_edit (
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (content_area), vbox);
gtk_widget_show_all (content_area);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
-
+selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW (treeview));
+if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+{
+gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 2,
&app_info, -1);
+if ( app_info != NULL )
+{
+g_app_info_launch (G_A
[Xfce4-commits] Add choose-editor dialog
Updating branch refs/heads/master
to f1bb06c3cb065c449e82b20cb75e8104d7421730 (commit)
from 956b4bb92d5b39699df3e9a0a6eb3f99e022caa1 (commit)
commit f1bb06c3cb065c449e82b20cb75e8104d7421730
Author: Stephan Arts
Date: Fri Mar 30 01:57:56 2012 +0200
Add choose-editor dialog
src/main_window.c | 62 +++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index db7462e..edef1fa 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -2876,9 +2876,67 @@ cb_rstto_main_window_edit (
const gchar *content_type = rstto_file_get_content_type (r_file);
const gchar *editor = rstto_mime_db_lookup (window->priv->db,
content_type);
GList *files = g_list_prepend (NULL, rstto_file_get_file (r_file));
+GDesktopAppInfo *app_info = NULL;
+GtkWidget *dialog = NULL;
+GtkWidget *content_area;
+GtkWidget *hbox;
+GtkWidget *vbox;
+GtkWidget *image;
+GtkWidget *label;
+GtkWidget *treeview;
+GtkWidget *scrolled_window;
+gchar *label_text = NULL;
+
+if ( editor != NULL )
+{
+app_info = g_desktop_app_info_new (editor);
+if ( app_info != NULL )
+{
+g_app_info_launch (G_APP_INFO(app_info), files, NULL, NULL);
+g_list_free (files);
+return;
+}
+}
+
+dialog = gtk_dialog_new_with_buttons (
+_("Edit with"),
+GTK_WINDOW (window),
+GTK_DIALOG_DESTROY_WITH_PARENT,
+GTK_STOCK_CANCEL,
+GTK_RESPONSE_CANCEL,
+GTK_STOCK_OK,
+GTK_RESPONSE_OK,
+NULL);
+
+content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+vbox = gtk_vbox_new (FALSE, 0);
+hbox = gtk_hbox_new (FALSE, 0);
+image = gtk_image_new_from_icon_name (content_type, GTK_ICON_SIZE_DIALOG);
+label_text = g_strdup_printf (_("Open %s and other files of type %s
with:"), rstto_file_get_display_name (r_file), content_type);
+label = gtk_label_new (label_text);
+scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+treeview = gtk_tree_view_new ();
+
+gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+
+gtk_container_add (GTK_CONTAINER (scrolled_window), treeview);
-GDesktopAppInfo *app_info = g_desktop_app_info_new (editor);
-g_app_info_launch (G_APP_INFO(app_info), files, NULL, NULL);
+gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+gtk_container_add (GTK_CONTAINER (content_area), vbox);
+
+gtk_widget_show_all (content_area);
+
+if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+{
+
+}
+
+gtk_widget_destroy (dialog);
+
g_list_free (files);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Launch default editor configured in $XDG_DATA_DIR/mime.db
Updating branch refs/heads/master
to 956b4bb92d5b39699df3e9a0a6eb3f99e022caa1 (commit)
from d64b4b629756357bd71b6fcdc77ca6b05a3de3e3 (commit)
commit 956b4bb92d5b39699df3e9a0a6eb3f99e022caa1
Author: Stephan Arts
Date: Fri Mar 30 01:25:13 2012 +0200
Launch default editor configured in $XDG_DATA_DIR/mime.db
configure.in.in |1 +
src/Makefile.am |4 +-
src/db.c | 23 --
src/db.h | 26 --
src/main_window.c | 116 +++-
src/mime_db.c | 223 +
src/mime_db.h | 82 +++
7 files changed, 371 insertions(+), 104 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 310f9c2..c83c30a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -57,6 +57,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.18.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index e86d739..4f55735 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ ristretto_SOURCES = \
file.c file.h \
privacy_dialog.h privacy_dialog.c \
util.c util.h \
- db.c db.h \
+ mime_db.c mime_db.h \
icon_bar.c icon_bar.h \
main.c
@@ -27,6 +27,7 @@ ristretto_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GIO_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
$(LIBEXIF_CFLAGS) \
$(XFCONF_CFLAGS) \
$(EXO_CFLAGS) \
@@ -44,6 +45,7 @@ ristretto_LDADD = \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(GIO_LIBS) \
+ $(GIO_UNIX_LIBS) \
$(LIBEXIF_LIBS) \
$(XFCONF_LIBS) \
$(EXO_LIBS) \
diff --git a/src/db.c b/src/db.c
deleted file mode 100644
index 9989850..000
--- a/src/db.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Stephan Arts 2012
- *
- * 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 Library 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.
- */
-
-#include
-#include
-#include
-
-#include "db.h"
diff --git a/src/db.h b/src/db.h
deleted file mode 100644
index 3d59cdd..000
--- a/src/db.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Stephan Arts 2011
- *
- * 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 Library 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.
- */
-
-#ifndef __RISTRETTO_DB_H__
-#define __RISTRETTO_DB_H__
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __RSTTO_DB_H__ */
diff --git a/src/main_window.c b/src/main_window.c
index 5e1e0a1..db7462e 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -32,6 +33,7 @@
#include
#include "settings.h"
+#include "mime_db.h"
#include "util.h"
#include "file.h"
#include "icon_bar.h"
@@ -63,58 +65,60 @@
struct _RsttoMainWindowPriv
{
-RsttoImageList *image_list;
+RsttoImageList*image_list;
-DBusGConnection *connection;
-DBusGProxy *filemanager_proxy;
+RsttoMimeDB *db;
-guint show_fs_toolbar_timeout_id;
-gint window_save_geometry_timer_id;
+DBusGConnection *connection;
+DBusGProxy*filemanager_proxy;
+
+guint show_fs_toolbar_timeout_id;
+gint window_save_geometry_timer_id;
-gboolean fs_toolbar_sticky;
+gboolean
[Xfce4-commits] Remove compiler warnings
Updating branch refs/heads/master to d64b4b629756357bd71b6fcdc77ca6b05a3de3e3 (commit) from 21087fcb542b48552312b238c026a4de854d22df (commit) commit d64b4b629756357bd71b6fcdc77ca6b05a3de3e3 Author: Stephan Arts Date: Sat Mar 3 11:42:26 2012 +0100 Remove compiler warnings src/main_window.c |7 +-- 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index 7a29aaa..5e1e0a1 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -304,17 +304,12 @@ rstto_main_window_set_thumbnail_size ( RsttoMainWindow *window, RsttoThumbnailSize size); - -static void -cb_rstto_merge_toolbars_changed ( -GObject *settings, -GParamSpec *pspec, -gpointer user_data); static void cb_rstto_wrap_images_changed ( GObject *object, GParamSpec *pspec, gpointer user_data); + static void cb_rstto_desktop_type_changed ( GObject *object, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve file-compare statement performance
Updating branch refs/heads/master
to 08099d83701a4b9ab74657147af5ffe0192246ac (commit)
from 74ab3f9fd1588ab66ebc7133264840d023c76d73 (commit)
commit 08099d83701a4b9ab74657147af5ffe0192246ac
Author: Stephan Arts
Date: Mon Feb 27 20:14:49 2012 +0100
Improve file-compare statement performance
src/file.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/file.c b/src/file.c
index e840c53..d5beabf 100644
--- a/src/file.c
+++ b/src/file.c
@@ -281,7 +281,7 @@ rstto_file_get_file ( RsttoFile *file )
gboolean
rstto_file_equal ( RsttoFile *a, RsttoFile *b )
{
-return g_file_equal (a->priv->file, b->priv->file);
+return a == b;
}
const gchar *
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 266b6c376a6563fbe0c79333eb35723f6a79959f (commit) from 8b7e428bba6524e8e2e521731914fab5bc78c3bd (commit) commit 266b6c376a6563fbe0c79333eb35723f6a79959f Author: Cristian Marchi Date: Fri Mar 30 20:25:45 2012 +0200 l10n: Updated Italian (it) translation to 100% New status: 208 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 736 +++--- 1 files changed, 421 insertions(+), 315 deletions(-) diff --git a/po/it.po b/po/it.po index 56b4974..b087545 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-22 04:13+\n" +"POT-Creation-Date: 2012-03-30 16:15+\n" "PO-Revision-Date: 2010-01-28 15:03+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" @@ -151,97 +151,13 @@ msgstr "Semplice" msgid "Simple Splash Engine" msgstr "Motore di avvio Semplice" -#: ../panel-plugin/xfsm-logout-plugin.c:86 -msgid "Session" -msgstr "Sessione" +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "Avvio il salvaschermo e il programma di blocco" -#: ../panel-plugin/xfsm-logout-plugin.c:87 -msgid "Loc_k screen" -msgstr "Blo_cca schermo" - -#: ../panel-plugin/xfsm-logout-plugin.c:88 -#: ../panel-plugin/xfsm-logout-plugin.c:128 -msgid "_Suspend" -msgstr "Sos_pendi" - -#: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 -msgid "_Hibernate" -msgstr "_Iberna" - -#: ../panel-plugin/xfsm-logout-plugin.c:90 -#: ../panel-plugin/xfsm-logout-plugin.c:121 -msgid "_Reboot" -msgstr "_Riavvia" - -#: ../panel-plugin/xfsm-logout-plugin.c:91 -#: ../panel-plugin/xfsm-logout-plugin.c:114 -msgid "Shut _down" -msgstr "_Spegni" - -#: ../panel-plugin/xfsm-logout-plugin.c:92 -#: ../panel-plugin/xfsm-logout-plugin.c:107 -msgid "_Log out" -msgstr "_Esci" - -#. XFSM_SHUTDOWN_ASK -#. XFSM_SHUTDOWN_LOGOUT -#: ../panel-plugin/xfsm-logout-plugin.c:105 -msgid "Are you sure you want to log out?" -msgstr "Uscire davvero?" - -#: ../panel-plugin/xfsm-logout-plugin.c:106 -#, c-format -msgid "You will be logged out in %u seconds." -msgstr "Uscita tra %u secondi." - -#: ../panel-plugin/xfsm-logout-plugin.c:109 -msgid "Failed to log out." -msgstr "Impossibile uscire." - -#. XFSM_SHUTDOWN_HALT -#: ../panel-plugin/xfsm-logout-plugin.c:112 -msgid "Are you sure you want to shut down?" -msgstr "Spegnere davvero?" - -#: ../panel-plugin/xfsm-logout-plugin.c:113 -#, c-format -msgid "Your system will shut down in %u seconds." -msgstr "Il sistema si spegnerà tra %u secondi." - -#: ../panel-plugin/xfsm-logout-plugin.c:116 -msgid "Failed to shut down." -msgstr "Spegnimento non riuscito." - -#. XFSM_SHUTDOWN_REBOOT -#: ../panel-plugin/xfsm-logout-plugin.c:119 -msgid "Are you sure you want to reboot?" -msgstr "Riavviare davvero?" - -#: ../panel-plugin/xfsm-logout-plugin.c:120 -#, c-format -msgid "Your system will reboot in %u seconds." -msgstr "Il sistema si riavvierà tra %u secondi." - -#: ../panel-plugin/xfsm-logout-plugin.c:123 -msgid "Failed to reboot." -msgstr "Riavvio non riuscito" - -#: ../panel-plugin/xfsm-logout-plugin.c:130 -msgid "Failed to suspend" -msgstr "Sospensione non riuscita" - -#: ../panel-plugin/xfsm-logout-plugin.c:137 -msgid "Failed to hibernate" -msgstr "Ibernazione non riuscita" - -#: ../panel-plugin/xfsm-logout-plugin.c:150 -msgid "Xflock4 could not be launched" -msgstr "Xflock4 non può essere avviato" - -#: ../panel-plugin/xfsm-logout-plugin.c:222 -msgid "Close Session" -msgstr "Chiudi la sessione" +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "Salvaschermo" #: ../settings/main.c:43 msgid "Settings manager socket" @@ -255,27 +171,30 @@ msgstr "SOCKET ID" msgid "Version information" msgstr "Informazioni di versione" -#: ../settings/main.c:74 +#: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." msgstr "Digitare \"%s --help\" per le modalità d'uso" -#: ../settings/main.c:86 ../xfce4-session/main.c:219 +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:124 msgid "The Xfce development team. All rights reserved." msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati." -#: ../settings/main.c:87 ../xfce4-session/main.c:225 +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:127 #, c-format msgid "Please report bugs to <%s>." msgstr "Segnalare i problemi a <%s>." -#: ../settings/main.c:96 ../xfce4-session/main.c:231 +#: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" msgstr "Impossibile contattare il server delle impostazioni" -#: ../settings/main.c:115 +#: ../settings/main.c:
