[Xfce4-commits] systray: reworked layout mechanism.
Updating branch refs/heads/andrzejr/deskbar2
to b60951e3e9bf76680689736013904b89f5a0ed73 (commit)
from f36269287e32cab3239a07f44b9be00ba8bd11f1 (commit)
commit b60951e3e9bf76680689736013904b89f5a0ed73
Author: Andrzej
Date: Thu Jan 26 18:54:00 2012 +0900
systray: reworked layout mechanism.
Previous commit was badly broken (non-square icons were braking the layout).
Changes:
- Propagating orientation settings to systray manager.
- systray-box size_request/size_allocate use now integer arithmetic.
- ... and slot mechanism (all slots are assumed to be square,
this may look like a limitation but the icons look better this way).
- ... works with any horizontal/vertical icons
(this is required because addition of the deskbar mode)
- Icon sizes are slightly smaller than the row size to match icon sizes
in "small" plugins. This is only an approximation and is not accurate
across all gtk styles and icon sizes.
- Scaling down the row size by 1px when the icons don't fit was removed.
Icons should now fit unless some complex conflicting non-square icons are
used.
Limitations:
- Non-square icons (tested with "workrave") sometimes want
multi-row _and_ multi-column allocation.
This is not supported (it would complicate the layout significantly
for little benefit).
If this happens, one dimension of the icon will be clipped
to the row size. Workaround: use a larger row size.
plugins/systray/systray-box.c | 300 +++--
plugins/systray/systray.c | 30 +++--
2 files changed, 187 insertions(+), 143 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 827a1e1..13ab3c8 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -204,12 +204,13 @@ systray_box_size_get_max_child_size (SystrayBox *box,
gintalloc_size,
gint *rows_ret,
gint *row_size_ret,
- gint *offset_ret)
+ gint *icon_size_ret)
{
GtkWidget *widget = GTK_WIDGET (box);
gint size;
gint rows;
gint row_size;
+ gint icon_size;
alloc_size -= 2 * GTK_CONTAINER (widget)->border_width;
@@ -230,7 +231,10 @@ systray_box_size_get_max_child_size (SystrayBox *box,
rows = MAX (rows, box->nrows);
row_size = (alloc_size - (rows - 1) * SPACING) / rows;
- row_size = MIN (box->size_max, row_size);
+
+ /* limiting the icon size to the row_size */
+ /* adding an arbitrary padding added to mimic the size of other icons in the
panel */
+ icon_size = MIN (box->size_max, row_size - 2);
if (rows_ret != NULL)
*rows_ret = rows;
@@ -238,13 +242,34 @@ systray_box_size_get_max_child_size (SystrayBox *box,
if (row_size_ret != NULL)
*row_size_ret = row_size;
- if (offset_ret != NULL)
-{
- rows = MIN (rows, box->n_visible_children);
- *offset_ret = (alloc_size - (rows * row_size + (rows - 1) * SPACING)) /
2;
- if (*offset_ret < 1)
-*offset_ret = 0;
-}
+ if (icon_size_ret != NULL)
+*icon_size_ret = icon_size;
+}
+
+
+
+static gint
+systray_box_calc_seq_cells (gint row_size,
+gint icon_size,
+gdouble aspect,
+gint limit,
+gint*longer_edge_ret)
+{
+ gintlonger_edge;
+ gintseq_cells_1;
+
+ /* assume aspect > 1 */
+ longer_edge = rint (icon_size * aspect);
+ seq_cells_1 =
+rint (ceil ((gdouble) (longer_edge - icon_size - SPACING) / (gdouble)
row_size));
+
+ if (limit > 0)
+seq_cells_1 = MIN (seq_cells_1, limit - 1);
+
+ if (longer_edge_ret != NULL)
+*longer_edge_ret = seq_cells_1 * (row_size + SPACING) + icon_size;
+
+ return seq_cells_1 + 1;
}
@@ -259,22 +284,26 @@ systray_box_size_request (GtkWidget *widget,
GtkRequisition child_req;
gintn_hidden_childeren = 0;
gintrows;
- gdouble cols;
+ gintcols;
gintrow_size;
- gdouble cells;
+ ginticon_size;
+ gintcells;
gintmin_seq_cells = -1;
+ gintseq_cells;
+ gintlimit;
gdouble ratio;
GSList *li;
gbooleanhidden;
+ gbooleanperpendicular;
gintcol_px;
gintrow_px;
box->n_visible_children = 0;
/* get some info about the n_rows we're going to allocate */
- systray_box_size_get_max_child_size (box, box->size_alloc, &rows, &row_size,
NULL);
+ systray_box_size_get_max_child_size (box, box->size_alloc, &rows, &row_size,
&icon_size);
- for (li = box->childeren, cells = 0.00; l
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to ea008cc93b2f332758d57ffb6dc1171ee4e9255e (commit) from 06e94410fff88e5e69c8a9b46bb9087c88667b8b (commit) commit ea008cc93b2f332758d57ffb6dc1171ee4e9255e Author: Andres Sanchez Date: Thu Jan 26 13:58:20 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 600 messages complete with 73 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po | 226 +- 1 files changed, 67 insertions(+), 159 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index b4420e5..3b1b031 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -2,7 +2,7 @@ # Copyright (C) by the creators of the webpage and the package. # This file is distributed under the same license as the www.xfce.org package. # Andres Sanchez , 2011. -# +# msgid "" msgstr "" "Project-Id-Version: www.xfce.org\n" @@ -29,38 +29,27 @@ msgstr "Categorías" msgid "Home" msgstr "Inicio" -#: header.php:62 -#: about/nav.php:4 -#: about/index.php:1 +#: header.php:62 about/nav.php:4 about/index.php:1 msgid "About" msgstr "Acerca De" -#: header.php:63 -#: download/nav.php:6 -#: download/index.php:5 +#: header.php:63 download/nav.php:6 download/index.php:5 msgid "Download" msgstr "Descargar" -#: header.php:64 -#: community/nav.php:4 -#: community/index.php:3 +#: header.php:64 community/nav.php:4 community/index.php:3 msgid "Community" msgstr "Comunidad" -#: header.php:65 -#: getinvolved/nav.php:4 -#: getinvolved/index.php:1 +#: header.php:65 getinvolved/nav.php:4 getinvolved/index.php:1 msgid "Get Involved" msgstr "Involucrarse" -#: header.php:66 -#: projects/nav.php:4 -#: projects/index.php:3 +#: header.php:66 projects/nav.php:4 projects/index.php:3 msgid "Projects" msgstr "Proyectos" -#: header.php:73 -#: header.php:87 +#: header.php:73 header.php:87 msgid "Change language" msgstr "Cambiar idioma" @@ -112,52 +101,41 @@ msgstr "Noticias de Xfce" msgid "Xfce release announcements" msgstr "Anuncios de publicación de Xfce" -#: feed.php:42 -#: about/news.php:31 -#: frontpage.php:61 +#: feed.php:42 about/news.php:31 frontpage.php:61 #, php-format msgid "Xfce %s released" msgstr "Xfce %s publicado" -#: about/credits.php:8 -#: about/tour46.php:240 -#: about/nav.php:8 +#: about/credits.php:8 about/tour46.php:240 about/nav.php:8 #: about/tour44.php:222 msgid "Credits" msgstr "Créditos" -#: about/credits.php:11 -#: about/credits.php:61 +#: about/credits.php:11 about/credits.php:61 msgid "Core developers" msgstr "Desarrolladores del núcleo" -#: about/credits.php:12 -#: about/credits.php:72 +#: about/credits.php:12 about/credits.php:72 msgid "Active contributors" msgstr "Contribuidores activos" -#: about/credits.php:13 -#: about/credits.php:87 +#: about/credits.php:13 about/credits.php:87 msgid "Servers maintained by" msgstr "Servidores mantenidos por" -#: about/credits.php:14 -#: about/credits.php:98 +#: about/credits.php:14 about/credits.php:98 msgid "Goodies supervision" msgstr "Supervisor de Goodies" -#: about/credits.php:15 -#: about/credits.php:104 +#: about/credits.php:15 about/credits.php:104 msgid "Translations supervision" msgstr "Supervisor de las traducciones" -#: about/credits.php:16 -#: about/credits.php:111 +#: about/credits.php:16 about/credits.php:111 msgid "Translators" msgstr "Traductores" -#: about/credits.php:17 -#: about/credits.php:114 +#: about/credits.php:17 about/credits.php:114 msgid "Previous contributors" msgstr "Contribuidores antigüos" @@ -197,9 +175,7 @@ msgstr "Xfce 4.6Proporciona un nuevo menú de escritorio que permite mani msgid "New desktop menu" msgstr "Nuevo menú de escritorio" -#: about/tour46.php:25 -#: about/index.php:33 -#: about/tour44.php:102 +#: about/tour46.php:25 about/index.php:33 about/tour44.php:102 #: projects/index.php:27 msgid "Panel" msgstr "Panel" @@ -216,8 +192,7 @@ msgstr "Nuevo reloj binario" msgid "The clock plugin has been rewritten to consume fewer system resources and to fix some display bugs, but there is also a new clock mode for the geek in you: binary clock! The new notification area plugin allows you to hide selected notification icons to keep your notification area clean and readable." msgstr "El plug-in del reloj ha sido reescrito para consumir menos recursos del sistema y para corregir algunos errores de visualización, pero también hay un modo nuevo reloj para el geek que hay en ti: el reloj binario! La nueva área del plug-in de notificación le permite ocultar los iconos de notificación seleccionados para mantener el área de notificación limpia y legible." -#: about/tour46.php:39 -#: about/tour46.php:46 +#: about/tour46.php:39 about/tour46.php:46 msgid "New sound mixer" msgstr "Nuevo mezclador de sonido" @@ -429,8 +404,7 @@ msgstr "Xfce 4.6 también viene con una nueva aplicación de búsqueda qu msgid "New application finder
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to fcf1d06ee1784f989ce7d6964659b5331e1abb16 (commit) from ea008cc93b2f332758d57ffb6dc1171ee4e9255e (commit) commit fcf1d06ee1784f989ce7d6964659b5331e1abb16 Author: Andres Sanchez Date: Thu Jan 26 14:02:19 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 601 messages complete with 72 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 3b1b031..93b9aa5 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -1918,9 +1918,8 @@ msgid "There's lots of people using and testing Xfce. By providing useful and up msgstr "Hay un montón de personas que utilizan y prueban Xfce. Al proporcionar documentación útil y actualizada, hará un gran impacto en ayudar a las personas a entender cómo aprovechar al máximo en Entorno de Escritorio Xfce." #: getinvolved/index.php:19 -#, fuzzy msgid "Are you fluent in multiple languages? By contributing your translations of text to the Xfce Desktop Environement, you will help Xfce be a better part of the global market and more accessible to the millions of potential users out there." -msgstr "¿Está usted con fluidez en varios idiomas? Contribuyendo con sus traducciones de texto a por el planeta de escritorio Xfce, que le ayudará a Xfce ser parte mejor del mercado global y más accesible a los millones de usuarios potenciales que hay." +msgstr "Tiene fluidez en varios idiomas? Contribuyendo con sus traducciones de texto al Entorno de Escritorio Xfce, ayudará a Xfce a ser una mejor parte del mercado global y ser más accesible a los millones de usuarios potenciales que hay." #: getinvolved/index.php:22 msgid "Development" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to f7af436e73046b1b04c1be87c362bdd612763a29 (commit) from fcf1d06ee1784f989ce7d6964659b5331e1abb16 (commit) commit f7af436e73046b1b04c1be87c362bdd612763a29 Author: Andres Sanchez Date: Thu Jan 26 14:03:17 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 601 messages complete with 72 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 93b9aa5..73ce55b 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -1907,7 +1907,7 @@ msgstr "Bienvenido a la comunidad Xfce. Al unirse a nuestro equipo, usted será #: getinvolved/index.php:9 msgid "Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences." -msgstr "Las tareas posibles incluyen los tests, informes de errores,escritura de código, desarrollo de elementos de artwork, documentación, traducciones, y la difusión y ayuda con la promoción, tanto en línea como en erias y conferencias." +msgstr "Las tareas posibles incluyen los tests, informes de errores, escritura de código, desarrollo de elementos de artwork, documentación, traducciones, y la difusión y ayuda con la promoción, tanto en línea como en ferias y conferencias." #: getinvolved/index.php:12 msgid "Documentation" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to b3c2041605eb1bcb27020d64ff95b00f0a206d72 (commit) from f7af436e73046b1b04c1be87c362bdd612763a29 (commit) commit b3c2041605eb1bcb27020d64ff95b00f0a206d72 Author: Andres Sanchez Date: Thu Jan 26 14:05:07 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 602 messages complete with 71 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 73ce55b..06b573f 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -969,9 +969,8 @@ msgid "At the end of this, a decision is made on which dependencies the next sta msgstr "Al final de este, se toma una decisión acerca de las dependencias de la próxima versión estable del escritorio Xfce. En particular, esto incluye las versiones mínimas requeridas para las dependencias esenciales del escritorio Xfce núcleo." #: about/releasemodel.php:159 -#, fuzzy msgid "Maintainers who were not available during the first 2 weeks of the planning phase have the chance to request dependency changes in the 2 weeks after that. " -msgstr "Responsables que no estaban disponibles durante las primeras 2 semanas de la fase de planificación tienen la oportunidad de solicitar cambios en la dependencia en las 2 semanas después de eso." +msgstr "Una vez que un error ha sido encontrado, la causa del error necesita ser identificada, y luego (obviamente) arreglada. Si quiere ser parte del actual proceso de desarrollo de Xfce una buena forma de comenzar es solucionando errores y enviando los parches." #: about/releasemodel.php:163 #, fuzzy ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to 8714b788623577000e2d16f0c8b3318d8c784d2d (commit) from b3c2041605eb1bcb27020d64ff95b00f0a206d72 (commit) commit 8714b788623577000e2d16f0c8b3318d8c784d2d Author: Andres Sanchez Date: Thu Jan 26 14:06:20 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 602 messages complete with 71 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 06b573f..09f3a38 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -1906,7 +1906,7 @@ msgstr "Bienvenido a la comunidad Xfce. Al unirse a nuestro equipo, usted será #: getinvolved/index.php:9 msgid "Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences." -msgstr "Las tareas posibles incluyen los tests, informes de errores, escritura de código, desarrollo de elementos de artwork, documentación, traducciones, y la difusión y ayuda con la promoción, tanto en línea como en ferias y conferencias." +msgstr "Las tareas posibles incluyen las pruebas, informes de errores, escritura de código, desarrollo de elementos de artwork, documentación, traducciones, y la difusión y ayuda con la promoción, tanto en línea como en ferias y conferencias." #: getinvolved/index.php:12 msgid "Documentation" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to 23919866c28cca1547b21334505d20210a4a95ff (commit) from 8714b788623577000e2d16f0c8b3318d8c784d2d (commit) commit 23919866c28cca1547b21334505d20210a4a95ff Author: Andres Sanchez Date: Thu Jan 26 14:09:06 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 603 messages complete with 70 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 09f3a38..48905a2 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -1900,9 +1900,8 @@ msgid "Buildbot" msgstr "Buildbot" #: getinvolved/index.php:5 -#, fuzzy msgid "Welcome to the Xfce community. By joining our team, you will be part of an international effort by hundreds of people working to deliver a stunning Free Software computing experience. You will meet new friends, learn new skills and make a difference to millions of users while working with people from all around the globe. There are many different ways you can become part of this, just read on and pick an area which interests you or seems challenging." -msgstr "Bienvenido a la comunidad Xfce. Al unirse a nuestro equipo, usted será parte de un esfuerzo internacional por cientos de personas que trabajan para ofrecer una impresionante experiencia de computación libre de software. Se encontrará con nuevos amigos, aprender nuevas habilidades y hacer una diferencia para millones de usuarios al trabajar con personas de todo el mundo. Hay muchas maneras diferentes que usted puede ser parte de esto, sólo sigue leyendo y escoger un área que le interesa o parece difícil." +msgstr "Bienvenido a la comunidad Xfce. Al unirse a nuestro equipo, usted será parte de un esfuerzo internacional de cientos de personas que trabajan para ofrecer una impresionante experiencia de computación con Software Libre. Encontrará nuevos amigos, aprenderá nuevas habilidades y hará una diferencia para millones de usuarios al trabajar con personas de todo el mundo. Hay muchas formas diferentes con las cuales puede hacer parte de esto, sólo siga leyendo y seleccione un área que le interese o le parezca desafiante." #: getinvolved/index.php:9 msgid "Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to fd0616964b3b6b6fcbd047a68165332a0866d71f (commit) from 23919866c28cca1547b21334505d20210a4a95ff (commit) commit fd0616964b3b6b6fcbd047a68165332a0866d71f Author: Andres Sanchez Date: Thu Jan 26 14:12:47 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 605 messages complete with 68 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 48905a2..42e8098 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -1219,9 +1219,8 @@ msgid "Desktop Icons" msgstr "Iconos de Escritorio" #: about/tour44.php:12 -#, fuzzy msgid "One of the most often requested features during the 4.0 and 4.2 was support for icons on the desktop. Now, with Xfce 4.4.0, this feature was finally added to the desktop manager Xfdesktop." -msgstr "Una de las características más solicitados durante los 4.0 y 4.2 fue el apoyo de los iconos en el escritorio. Ahora, con Xfce 4.4.0, esta función se añadió por último a la Xfdesktop gestor de escritorio." +msgstr "Una de las características más solicitadas en 4.0 y 4.2 fue el soporte de los iconos en el escritorio. Ahora, con Xfce 4.4.0, esta función por fin se añadió al gestor de escritorio Xfdesktop." #: about/tour44.php:18 msgid "The desktop manager utilizes Thunar's libraries to handle application launchers and regular files/folders on the desktop. The desktop manager is also able to display icons for minimized windows on the desktop, which is quite a popular feature from the CDE world. Of course, you can disable the desktop icons altogether if you prefer a clean desktop." @@ -1940,9 +1939,8 @@ msgid "Bug Reporting and testing" msgstr "Reporte de errores y testeo" #: getinvolved/index.php:34 -#, fuzzy msgid "One of the most useful tasks that we rely on the community for is testing and reporting of bugs. Since Xfce runs on various platform and in a lot of different setups, testing all changes in every possible situation is an impossible task. As such we kindly ask users to assist in testing, and reporting all bugs they may find, using our https://bugzilla.xfce.org\"; class=\"external\">bug tracker." -msgstr "Una de las tareas más útiles que nos apoyamos en la comunidad de está poniendo a prueba y reporte de errores. Desde Xfce se ejecuta en varias plataformas y en un montón de diferentes configuraciones, pruebas de todos los cambios en todas las situaciones posibles es una tarea imposible. Como tal, le pedimos a los usuarios ayudar a probar, y reportar todos los errores que puedan encontrar, usar nuestro https://bugzilla.xfce.org\"; class=\"external\">bug tracker ." +msgstr "Una de las tareas más útiles en las cuales nos apoyamos en la comunidad es probando y reportando errores. Desde que Xfce se ejecuta en varias plataformas y en un montón de diferentes configuraciones, pruebas de todos los cambios en todas las situaciones posibles es una tarea imposible. Como tal, le pedimos a los usuarios ayudar a probar, y reportar todos los errores que puedan encontrar, usando nuestro https://bugzilla.xfce.org\"; class=\"external\">rastreador de errores ." #: getinvolved/index.php:38 #, fuzzy ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 90%
Updating branch refs/heads/master to 4952cf42f310b11f2a8eb29718e9965c37401126 (commit) from fd0616964b3b6b6fcbd047a68165332a0866d71f (commit) commit 4952cf42f310b11f2a8eb29718e9965c37401126 Author: Andres Sanchez Date: Thu Jan 26 14:14:17 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 90% New status: 606 messages complete with 67 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 42e8098..5cc2908 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -2041,9 +2041,8 @@ msgid "The coordinator should not accept new translators without having a little msgstr "El coordinador no aceptara nuevos traductores sin tener una pequeña referencia de su implicación en otros proyectos.Si no tiene la seguridad de que un miembro nuevo tenga un conocimiento profundo en traducción, se podrá tener una breve entrevista con él por email. Entonces el coordinador puede, bien aceptar al nuevo miembro, de forma que le sea condecido directamente el permiso para realizar cambios en nuestros repositorios, o bien revisar el trabajo que envíe. Esta forma de trabajar es importante por ejemplo, siempre que las traducciones tengan que usar un vocabulario standad." #: getinvolved/translation.php:78 -#, fuzzy msgid "A good practice for the coordinator is to check the translations before a new release, that consists into compiling each Xfce component with the latest translations and making sure everything is in good shape." -msgstr "Una buena práctica para que el coordinador deberá comprobar las traducciones antes de una nueva versión, que consiste en la compilación de cada componente de Xfce con las últimas traducciones y asegurarse de que todo está en buena forma." +msgstr "Una buena práctica para el coordinador es comprobar las traducciones antes de una nueva versión, lo que consiste en la compilación de cada componente de Xfce con las últimas traducciones y la aseguración de que todo está en buena forma." #: getinvolved/translation.php:83 msgid "Statistics" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Spanish (Castilian) (es) translation to 90%
Updating branch refs/heads/master to b001493402decdae4e7439b90cea87d866d03d0e (commit) from 4952cf42f310b11f2a8eb29718e9965c37401126 (commit) commit b001493402decdae4e7439b90cea87d866d03d0e Author: Andres Sanchez Date: Thu Jan 26 14:19:59 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 90% New status: 608 messages complete with 65 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 5cc2908..cbec9ea 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -2278,9 +2278,8 @@ msgid "Collection releases of the core modules" msgstr "Colección de publicaciones de los módulos del núcleo" #: download/building.php:46 -#, fuzzy msgid "From time to time a new collection release if Xfce is made. A collection release consists of a number of individual tarballs and a fat-tarball that contains all the individual tarballs." -msgstr "De vez en cuando un comunicado de la nueva colección, si se hace Xfce. Un comunicado de la colección se compone de una serie de archivos comprimidos individuales y una copia de respaldo de grasa que contiene todos los archivos de código individual." +msgstr "De vez en cuando una publicación de nueva colección de Xfce es hecha. Una publicación de colección consiste en un número de tarballs individuales y un tarball grande que contiene todos los tarballs individuales." #: download/building.php:50 #, fuzzy @@ -2292,9 +2291,8 @@ msgid "Individual releases" msgstr "Publicaciones individuales" #: download/building.php:56 -#, fuzzy msgid "Each package in Xfce is allowed to make development and stable releases at any time, see the release model documentation for more information." -msgstr "Cada paquete en Xfce se le permite hacer el desarrollo y versiones estables en cualquier momento, ver el modelo de liberación de la documentación para más información." +msgstr "A cada paquete en Xfce se le permite hacer desarrollo y versiones estables en cualquier momento, vea la documentación del modelo de publicaciónpara más información." #: download/building.php:61 msgid "From the code repository" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Round rendering of image to whole pixels (Bug #8317)
Updating branch refs/heads/ristretto-0.3 to 2e0805e4d1e8152e4272a97175107522bc58c190 (commit) from 9c41e517bcb039e4d9351071a416506fcf6f44cc (commit) commit 2e0805e4d1e8152e4272a97175107522bc58c190 Author: Stephan Arts Date: Thu Jan 26 07:53:00 2012 +0100 Round rendering of image to whole pixels (Bug #8317) src/image_viewer.c | 20 ++-- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 3be326b..36a0f25 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1002,8 +1002,8 @@ paint_image ( } cairo_save (ctx); -x_offset = viewer->priv->rendering.x_offset; -y_offset = viewer->priv->rendering.y_offset; +x_offset = floor ( viewer->priv->rendering.x_offset ); +y_offset = floor ( viewer->priv->rendering.y_offset ); /* BEGIN PAINT CHECKERED BACKGROUND */ if (TRUE == gdk_pixbuf_get_has_alpha (viewer->priv->pixbuf)) @@ -1063,8 +1063,8 @@ paint_image ( M_PI*0.5); cairo_translate ( ctx, -0.0 - gtk_adjustment_get_value (viewer->vadjustment), -gtk_adjustment_get_value (viewer->hadjustment)); +0.0 - floor (gtk_adjustment_get_value (viewer->vadjustment)), +floor (gtk_adjustment_get_value (viewer->hadjustment))); cairo_translate ( ctx, 0.0, @@ -1080,8 +1080,8 @@ paint_image ( M_PI*1.5); cairo_translate ( ctx, -gtk_adjustment_get_value (viewer->vadjustment), -0.0 - gtk_adjustment_get_value (viewer->hadjustment)); +floor(gtk_adjustment_get_value (viewer->vadjustment)), +0.0 - floor(gtk_adjustment_get_value (viewer->hadjustment))); cairo_translate ( ctx, -1.0 * viewer->priv->image_width * viewer->priv->scale, @@ -1098,8 +1098,8 @@ paint_image ( M_PI); cairo_translate ( ctx, -gtk_adjustment_get_value (viewer->hadjustment), -gtk_adjustment_get_value (viewer->vadjustment)); +floor(gtk_adjustment_get_value (viewer->hadjustment)), +floor(gtk_adjustment_get_value (viewer->vadjustment))); cairo_translate ( ctx, -1.0 * viewer->priv->image_width * viewer->priv->scale, @@ -1114,8 +1114,8 @@ paint_image ( default: cairo_translate ( ctx, -0.0 - gtk_adjustment_get_value (viewer->hadjustment), -0.0 - gtk_adjustment_get_value (viewer->vadjustment)); +0.0 - floor(gtk_adjustment_get_value (viewer->hadjustment)), +0.0 - floor(gtk_adjustment_get_value (viewer->vadjustment))); cairo_translate ( ctx, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix --slideshow and --fullscreen cli options
Updating branch refs/heads/ristretto-0.3
to 8cdb689bb286106c48d36023e860d159bf48ce54 (commit)
from 2e0805e4d1e8152e4272a97175107522bc58c190 (commit)
commit 8cdb689bb286106c48d36023e860d159bf48ce54
Author: Stephan Arts
Date: Thu Jan 26 07:54:51 2012 +0100
Fix --slideshow and --fullscreen cli options
src/main.c| 14 ++-
src/main_window.c | 108 ++---
src/main_window.h |6 ++-
3 files changed, 79 insertions(+), 49 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6489ed7..5873744 100644
--- a/src/main.c
+++ b/src/main.c
@@ -150,9 +150,15 @@ main(int argc, char **argv)
}
}
+/* Start fullscreen */
+if (TRUE == start_fullscreen)
+{
+ gtk_window_fullscreen (GTK_WINDOW (window));
+}
+
g_signal_connect(G_OBJECT(window), "destroy",
G_CALLBACK(gtk_main_quit), NULL);
gtk_widget_show_all (window);
-
+
GDK_THREADS_ENTER();
gtk_main();
GDK_THREADS_LEAVE();
@@ -263,6 +269,12 @@ cb_rstto_open_files (RsttoOpenFiles *rof)
/* Point the iterator to the correct image */
rstto_image_list_iter_set_position (iter, 0);
}
+
+if (TRUE == start_slideshow)
+{
+rstto_main_window_play_slideshow (RSTTO_MAIN_WINDOW(rof->window));
+}
+
}
return FALSE;
}
diff --git a/src/main_window.c b/src/main_window.c
index 2e26e14..7a8396d 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1263,6 +1263,10 @@ rstto_main_window_update_buttons (RsttoMainWindow
*window)
}
}
+if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) &
GDK_WINDOW_STATE_FULLSCREEN ))
+{
+gtk_widget_hide (window->priv->toolbar);
+}
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/save-copy"), TRUE);
/*
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/print"), TRUE);
@@ -1390,6 +1394,10 @@ rstto_main_window_update_buttons (RsttoMainWindow
*window)
}
}
+if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) &
GDK_WINDOW_STATE_FULLSCREEN ))
+{
+gtk_widget_hide (window->priv->toolbar);
+}
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/save-copy"), TRUE);
/*
gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (
window->priv->ui_manager, "/main-menu/file-menu/print"), TRUE);
@@ -2301,53 +2309,7 @@ cb_rstto_main_window_show_fs_toolbar_timeout
(RsttoMainWindow *window)
static void
cb_rstto_main_window_play (GtkWidget *widget, RsttoMainWindow *window)
{
-GValue timeout = {0, };
-
-gtk_ui_manager_add_ui (window->priv->ui_manager,
- window->priv->pause_merge_id,
- "/main-menu/go-menu/placeholder-slideshow",
- "pause",
- "pause",
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
-gtk_ui_manager_remove_ui (window->priv->ui_manager,
- window->priv->play_merge_id);
-
-if ( TRUE == rstto_settings_get_boolean_property
(window->priv->settings_manager, "merge-toolbars"))
-{
-gtk_ui_manager_add_ui (
-window->priv->ui_manager,
-window->priv->toolbar_pause_merge_id,
-"/file-toolbar/placeholder-slideshow",
-"pause",
-"pause",
-GTK_UI_MANAGER_TOOLITEM,
-FALSE);
-gtk_ui_manager_remove_ui (
-window->priv->ui_manager,
-window->priv->toolbar_play_merge_id);
-}
-else
-{
-gtk_ui_manager_add_ui (
-window->priv->ui_manager,
-window->priv->toolbar_pause_merge_id,
-"/navigation-toolbar/placeholder-slideshow",
-"pause",
-"pause",
-GTK_UI_MANAGER_TOOLITEM,
-FALSE);
-gtk_ui_manager_remove_ui (
-window->priv->ui_manager,
-window->priv->toolbar_play_merge_id);
-}
-
-
-g_value_init (&timeout, G_TYPE_UINT);
-g_object_get_property (G_OBJECT(window->priv->settings_manager),
"slideshow-timeout", &timeout);
-
-window->priv->playing = TRUE;
-window->priv->play_timeout_id = g_timeout_add (g_value_get_uint
(&timeout)*1000, (GSourceFunc)cb_rstto_main_window_play_slideshow, window);
+rstto_main_window_play_slideshow (window);
}
/**
@@ -3500,3 +3462,55 @@ cb_rstto_desktop_type_changed (
rstto_main_window_update_buttons (
[Xfce4-commits] Update NEWS
Updating branch refs/heads/ristretto-0.3 to 84133924d8ed253bf3762c57d9a051fec1e15fa6 (commit) from 8cdb689bb286106c48d36023e860d159bf48ce54 (commit) commit 84133924d8ed253bf3762c57d9a051fec1e15fa6 Author: Stephan Arts Date: Thu Jan 26 17:48:55 2012 +0100 Update NEWS NEWS |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index a048376..5a23148 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,9 @@ x.x.x - Fix bug #8343 (Do not use symbols from gtk+ > 2.20) - Autogenerate Changelog on make dist - Update scale information when box-zoom is used. +- Fix bug #8317 (Blurred full-screen image) - round offset to nearest + pixel. +- Fix --fullscreen and --slideshow CLI options. 0.3.2 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Lithuanian (lt) translation to 74%
Updating branch refs/heads/master to 1e90504e107a7c1f976c37f94a3b62fbdfe6c72c (commit) from 8531247ca569edb74c9b4256f43ffdf628d25a10 (commit) commit 1e90504e107a7c1f976c37f94a3b62fbdfe6c72c Author: Algimantas Margevičius Date: Thu Jan 26 18:12:49 2012 +0100 l10n: Updated Lithuanian (lt) translation to 74% New status: 210 messages complete with 0 fuzzies and 73 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 447 +- 1 files changed, 239 insertions(+), 208 deletions(-) diff --git a/po/lt.po b/po/lt.po index f97d9a3..356a77f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2,60 +2,62 @@ # Copyright (C) 2005-2007 Jean-François Wauthy. # This file is distributed under the same license as the xfburn package. # mantas , 2006. +# Algimantas Margevičius , 2012. # msgid "" msgstr "" "Project-Id-Version: xfburn 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 22:14-0700\n" -"PO-Revision-Date: 2006-05-26 12:26+0300\n" -"Last-Translator: mantas \n" -"Language-Team: Lithuanian \n" +"POT-Creation-Date: 2012-01-26 09:45+\n" +"PO-Revision-Date: 2012-01-26 19:11+0200\n" +"Last-Translator: Algimantas Margevičius \n" +"Language-Team: Lietuvių <>\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2)\n" #: ../xfburn/xfburn-adding-progress.c:111 msgid "Adding files to the composition" -msgstr "" +msgstr "Failai pridedami į projektą" #: ../xfburn/xfburn-blank-dialog.c:71 msgid "Quick Blank" -msgstr "" +msgstr "Greitai trynimas" #: ../xfburn/xfburn-blank-dialog.c:72 msgid "Full Blank (slow)" -msgstr "" +msgstr "Pilnas trynimas(lėtas)" #: ../xfburn/xfburn-blank-dialog.c:73 msgid "Quick Format" -msgstr "" +msgstr "Greitas formatavimas" #: ../xfburn/xfburn-blank-dialog.c:74 msgid "Full Format" -msgstr "" +msgstr "Pilnas formatavimas" #: ../xfburn/xfburn-blank-dialog.c:75 msgid "Quick Deformat" -msgstr "" +msgstr "Greitas deformavimas" #: ../xfburn/xfburn-blank-dialog.c:76 msgid "Full Deformat (slow)" -msgstr "" +msgstr "Pilnas deformatavimas (lėtai)" #: ../xfburn/xfburn-blank-dialog.c:149 msgid "Eject the disc" -msgstr "" +msgstr "Išstumti diską" #: ../xfburn/xfburn-blank-dialog.c:150 msgid "Default value for eject checkbox" -msgstr "" +msgstr "Numatytoji išstumimo pažymimojo langelio reikšmė" #: ../xfburn/xfburn-blank-dialog.c:197 msgid "Blank Disc" -msgstr "" +msgstr "Tuščias diskas" #: ../xfburn/xfburn-blank-dialog.c:209 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:195 @@ -64,11 +66,11 @@ msgstr "" #: ../xfburn/xfburn-copy-dvd-dialog.c:131 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:159 msgid "Burning device" -msgstr "" +msgstr "Įrašymo įrenginys" #: ../xfburn/xfburn-blank-dialog.c:222 ../xfburn/xfburn-device-box.c:190 msgid "Blank mode" -msgstr "" +msgstr "Tuščias režimas" #: ../xfburn/xfburn-blank-dialog.c:230 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:227 @@ -77,7 +79,7 @@ msgstr "" #: ../xfburn/xfburn-copy-dvd-dialog.c:139 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:193 msgid "Options" -msgstr "" +msgstr "Parinktys" #: ../xfburn/xfburn-blank-dialog.c:234 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:231 @@ -86,45 +88,45 @@ msgstr "" #: ../xfburn/xfburn-copy-dvd-dialog.c:143 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:197 msgid "E_ject disk" -msgstr "" +msgstr "_Išstumti laikmeną" #: ../xfburn/xfburn-blank-dialog.c:244 msgid "_Blank" -msgstr "" +msgstr "_Tuščias" #. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones #: ../xfburn/xfburn-blank-dialog.c:355 msgid "The inserted disc is already blank." -msgstr "" +msgstr "Įdėtas diskas jau ir taip tuščias." #. these ones we can blank #: ../xfburn/xfburn-blank-dialog.c:361 msgid "Ready" -msgstr "" +msgstr "Pasiruošęs" #: ../xfburn/xfburn-blank-dialog.c:364 msgid "No disc detected in the drive." -msgstr "" +msgstr "Diskasukyje nėra disko." #: ../xfburn/xfburn-blank-dialog.c:373 msgid "Disc is not erasable." -msgstr "" +msgstr "Diskas nėra trinamas." #: ../xfburn/xfburn-blank-dialog.c:413 msgid "Blanking disc..." -msgstr "" +msgstr "Diskas trinamas..." #: ../xfburn/xfburn-blank-dialog.c:440 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:512 #: ../xfburn/xfburn-perform-burn.c:366 #, c-format msgid "Done" -msgstr "" +msgstr "Atlikta" #: ../xfburn/xfburn-blank-dialog.c:443 ../xfburn/xfburn-perform-burn.c:372 #: ../xfburn/xfburn-progress-dialog.c:603 msgid "Failure" -msgstr "" +msgstr "Nesėkmė" #: ../xfburn/xfburn-bla
[Xfce4-commits] Make filtering work.
Updating branch refs/heads/nick/settings-manager
to 47894fafb5acf0116abd8bc02c61593dc8440af6 (commit)
from 1f8b5e28992a09e24ec22f78577209fe4d82fac1 (commit)
commit 47894fafb5acf0116abd8bc02c61593dc8440af6
Author: Nick Schermer
Date: Thu Jan 26 19:24:21 2012 +0100
Make filtering work.
.../xfce-settings-manager-dialog.c | 301 +---
1 files changed, 255 insertions(+), 46 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 70ee927..0f34ad8 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -31,6 +31,7 @@
#endif
#include
+#include
#include
#include
@@ -45,6 +46,11 @@
+struct _XfceSettingsManagerDialogClass
+{
+XfceTitledDialogClass __parent__;
+};
+
struct _XfceSettingsManagerDialog
{
XfceTitledDialog __parent__;
@@ -53,12 +59,14 @@ struct _XfceSettingsManagerDialog
GtkListStore *store;
-GtkWidget *search_entry;
+GtkWidget *filter_entry;
+gchar *filter_text;
GtkWidget *category_viewport;
GtkWidget *category_scroll;
GtkWidget *category_box;
-GList *category_iconviews;
+
+GList *categories;
GtkWidget *socket_scroll;
GtkWidget *socket_viewport;
@@ -71,10 +79,16 @@ struct _XfceSettingsManagerDialog
gchar *help_component;
};
-struct _XfceSettingsManagerDialogClass
+typedef struct
{
-XfceTitledDialogClass __parent__;
-};
+GarconMenuDirectory *directory;
+XfceSettingsManagerDialog *dialog;
+GtkWidget *iconview;
+GtkWidget *box;
+}
+DialogCategory;
+
+
enum
{
@@ -83,25 +97,34 @@ enum
COLUMN_TOOLTIP,
COLUMN_MENU_ITEM,
COLUMN_MENU_DIRECTORY,
+COLUMN_FILTER_TEXT,
N_COLUMNS
};
-static void xfce_settings_manager_dialog_finalize (GObject
*object);
-static void xfce_settings_manager_dialog_style_set(GtkWidget
*widget,
- GtkStyle
*old_style);
-static void xfce_settings_manager_dialog_response (GtkDialog
*widget,
- gint
response_id);
-static void xfce_settings_manager_dialog_header_style (GtkWidget
*header,
- GtkStyle
*old_style,
- GtkWidget
*ebox);
-static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
- const gchar
*title,
- const gchar
*icon_name,
- const gchar
*subtitle);
-static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
-static void xfce_settings_manager_dialog_menu_reload
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_finalize(GObject
*object);
+static void xfce_settings_manager_dialog_style_set (GtkWidget
*widget,
+ GtkStyle
*old_style);
+static void xfce_settings_manager_dialog_response(GtkDialog
*widget,
+ gint
response_id);
+static void xfce_settings_manager_dialog_header_style(GtkWidget
*header,
+ GtkStyle
*old_style,
+ GtkWidget
*ebox);
+static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
+ const gchar
*title,
+ const gchar
*icon_name,
+ const gchar
*subtitle);
+static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_entry_changed (GtkWidget
*entry,
+
XfceSettingsManagerDialog *dialog);
+static gboolean xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
+ GdkEventKey
*event,
+
[Xfce4-commits] Directly activate item if it's the only visible item.
Updating branch refs/heads/nick/settings-manager
to d5c9b5022d12c0a647e0cc2fdd21a17526da618d (commit)
from 47894fafb5acf0116abd8bc02c61593dc8440af6 (commit)
commit d5c9b5022d12c0a647e0cc2fdd21a17526da618d
Author: Nick Schermer
Date: Thu Jan 26 19:32:57 2012 +0100
Directly activate item if it's the only visible item.
.../xfce-settings-manager-dialog.c | 35 +--
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 0f34ad8..ae0e507 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -653,6 +653,8 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
GList *li;
DialogCategory *category;
GtkTreePath*path;
+gintn_visible_items;
+GtkTreeModel *model;
if (event->keyval == GDK_Escape)
{
@@ -662,6 +664,22 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
}
else if (event->keyval == GDK_Return)
{
+/* count visible children */
+n_visible_items = 0;
+for (li = dialog->categories; li != NULL; li = li->next)
+{
+category = li->data;
+if (gtk_widget_get_visible (category->box))
+{
+model = exo_icon_view_get_model (EXO_ICON_VIEW
(category->iconview));
+n_visible_items += gtk_tree_model_iter_n_children (model,
NULL);
+
+/* stop searching if there are more then 1 items */
+if (n_visible_items > 1)
+break;
+}
+}
+
for (li = dialog->categories; li != NULL; li = li->next)
{
category = li->data;
@@ -670,12 +688,21 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
if (!gtk_widget_get_visible (category->box))
continue;
-/* select first item */
+
path = gtk_tree_path_new_first ();
-exo_icon_view_set_cursor (EXO_ICON_VIEW (category->iconview),
path, NULL, FALSE);
+if (n_visible_items == 1)
+{
+/* activate this one item */
+exo_icon_view_item_activated (EXO_ICON_VIEW
(category->iconview), path);
+}
+else
+{
+/* select first item in view */
+exo_icon_view_set_cursor (EXO_ICON_VIEW (category->iconview),
+ path, NULL, FALSE);
+gtk_widget_grab_focus (category->iconview);
+}
gtk_tree_path_free (path);
-
-gtk_widget_grab_focus (category->iconview);
break;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Properly destroy dialog on exit.
Updating branch refs/heads/nick/settings-manager
to dfffae65d28e1f4c89982b9465b40b71a2bf674c (commit)
from d5c9b5022d12c0a647e0cc2fdd21a17526da618d (commit)
commit dfffae65d28e1f4c89982b9465b40b71a2bf674c
Author: Nick Schermer
Date: Thu Jan 26 19:39:19 2012 +0100
Properly destroy dialog on exit.
.../xfce-settings-manager-dialog.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index ae0e507..f55bceb 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -332,6 +332,7 @@ xfce_settings_manager_dialog_response (GtkDialog *widget,
}
else
{
+gtk_widget_destroy (GTK_WIDGET (widget));
gtk_main_quit ();
}
}
@@ -688,7 +689,6 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
if (!gtk_widget_get_visible (category->box))
continue;
-
path = gtk_tree_path_new_first ();
if (n_visible_items == 1)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix key navigation with hidden categories.
Updating branch refs/heads/nick/settings-manager
to 394f1a2944bee2ea213521015645b22182e5798d (commit)
from dfffae65d28e1f4c89982b9465b40b71a2bf674c (commit)
commit 394f1a2944bee2ea213521015645b22182e5798d
Author: Nick Schermer
Date: Thu Jan 26 19:48:10 2012 +0100
Fix key navigation with hidden categories.
.../xfce-settings-manager-dialog.c | 23 +++
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index f55bceb..b7fe5d4 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -401,14 +401,27 @@ xfce_settings_manager_dialog_iconview_keynav_failed
(ExoIconView *
if (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN)
{
+/* find this category in the list */
li = g_list_find_custom (dialog->categories, current_view,
xfce_settings_manager_dialog_iconview_find);
-if (direction == GTK_DIR_DOWN)
-li = g_list_next (li);
-else
-li = g_list_previous (li);
-/* leave there is no view obove or below this one */
+/* find the next of previous visible item */
+for (; li != NULL; )
+{
+if (direction == GTK_DIR_DOWN)
+li = g_list_next (li);
+else
+li = g_list_previous (li);
+
+if (li != NULL)
+{
+category = li->data;
+if (gtk_widget_get_visible (category->box))
+break;
+}
+}
+
+/* leave there is no view above or below this one */
if (li == NULL)
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clear and focus filter entry when returning to all settings.
Updating branch refs/heads/nick/settings-manager to 0e1e1f50e8b73b38a3800352d428ed6e27b2a588 (commit) from 394f1a2944bee2ea213521015645b22182e5798d (commit) commit 0e1e1f50e8b73b38a3800352d428ed6e27b2a588 Author: Nick Schermer Date: Thu Jan 26 19:59:16 2012 +0100 Clear and focus filter entry when returning to all settings. .../xfce-settings-manager-dialog.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c index b7fe5d4..45f4b9e 100644 --- a/xfce4-settings-manager/xfce-settings-manager-dialog.c +++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c @@ -578,7 +578,10 @@ xfce_settings_manager_dialog_go_back (XfceSettingsManagerDialog *dialog) gtk_widget_set_sensitive (dialog->button_back, FALSE); gtk_widget_set_sensitive (dialog->button_help, TRUE); + gtk_widget_set_sensitive (dialog->filter_entry, TRUE); +gtk_entry_set_text (GTK_ENTRY (dialog->filter_entry), ""); +gtk_widget_grab_focus (dialog->filter_entry); socket = gtk_bin_get_child (GTK_BIN (dialog->socket_viewport)); if (G_LIKELY (socket != NULL)) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Attach start-interactive-search.
Updating branch refs/heads/nick/settings-manager
to d524382c8d8a4132b474f5faecb68816d5b4b7f8 (commit)
from 0e1e1f50e8b73b38a3800352d428ed6e27b2a588 (commit)
commit d524382c8d8a4132b474f5faecb68816d5b4b7f8
Author: Nick Schermer
Date: Thu Jan 26 20:06:27 2012 +0100
Attach start-interactive-search.
.../xfce-settings-manager-dialog.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 45f4b9e..2c3c3fd 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -953,6 +953,16 @@ xfce_settings_manager_dialog_selection_changed
(ExoIconView *iconv
+static gboolean
+xfce_settings_manager_start_search (GtkWidget *iconview,
+XfceSettingsManagerDialog *dialog)
+{
+gtk_widget_grab_focus (dialog->filter_entry);
+return TRUE;
+}
+
+
+
static void
xfce_settings_manager_dialog_category_free (gpointer data)
{
@@ -1038,6 +1048,8 @@ xfce_settings_manager_dialog_add_category
(XfceSettingsManagerDialog *dialog,
G_CALLBACK (xfce_settings_manager_dialog_item_activated), dialog);
g_signal_connect (G_OBJECT (iconview), "selection-changed",
G_CALLBACK (xfce_settings_manager_dialog_selection_changed), dialog);
+g_signal_connect (G_OBJECT (iconview), "start-interactive-search",
+G_CALLBACK (xfce_settings_manager_start_search), dialog);
render = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (iconview), render, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Strip some size from internal api.
Updating branch refs/heads/master
to ca328c940d0db5570f4973549df9c392a091bdb5 (commit)
from cf2ad3a78c183363c6abb6fe9d4affa2670677ee (commit)
commit ca328c940d0db5570f4973549df9c392a091bdb5
Author: Nick Schermer
Date: Thu Jan 26 21:22:16 2012 +0100
Strip some size from internal api.
Make the structure smaller. Drops from 216 to 176 bytes.
libxfce4util/xfce-rc-private.h |4
libxfce4util/xfce-rc-simple.c |6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/libxfce4util/xfce-rc-private.h b/libxfce4util/xfce-rc-private.h
index e654eb6..ab5f61a 100644
--- a/libxfce4util/xfce-rc-private.h
+++ b/libxfce4util/xfce-rc-private.h
@@ -46,10 +46,6 @@ struct _XfceRc
gboolean translated);
/* write_entry == NULL means readonly */
void (*write_entry) (XfceRc *rc, const gchar *key, const gchar *value);
- void (*reserved1) (void);
- void (*reserved2) (void);
- void (*reserved3) (void);
- void (*reserved4) (void);
gchar *locale;
};
diff --git a/libxfce4util/xfce-rc-simple.c b/libxfce4util/xfce-rc-simple.c
index dd6050b..af98987 100644
--- a/libxfce4util/xfce-rc-simple.c
+++ b/libxfce4util/xfce-rc-simple.c
@@ -86,7 +86,6 @@ struct _XfceRcSimple
{
XfceRc__parent__;
- gboolean shared_chunks;
GStringChunk *string_chunk;
gchar*filename;
@@ -95,8 +94,9 @@ struct _XfceRcSimple
Group*glast;
Group*group;
- gboolean dirty;
- gboolean readonly;
+ guint shared_chunks : 1;
+ guint dirty : 1;
+ guint readonly : 1;
};
struct _Entry
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix some code alignment.
Updating branch refs/heads/master
to eef2d3ee83ae11fbaac75f7c0951c40a450d7624 (commit)
from ca328c940d0db5570f4973549df9c392a091bdb5 (commit)
commit eef2d3ee83ae11fbaac75f7c0951c40a450d7624
Author: Nick Schermer
Date: Thu Jan 26 21:26:00 2012 +0100
Fix some code alignment.
libxfce4util/xfce-rc-private.h | 100 ++--
1 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/libxfce4util/xfce-rc-private.h b/libxfce4util/xfce-rc-private.h
index ab5f61a..e482729 100644
--- a/libxfce4util/xfce-rc-private.h
+++ b/libxfce4util/xfce-rc-private.h
@@ -29,23 +29,33 @@ typedef struct _XfceRcSimple XfceRcSimple;
struct _XfceRc
{
- void (*close) (XfceRc *rc);
- void (*flush) (XfceRc *rc);
- void (*rollback) (XfceRc *rc);
- gboolean (*is_dirty) (const XfceRc *rc);
- gboolean (*is_readonly) (const XfceRc *rc);
- gchar** (*get_groups) (const XfceRc *rc);
- gchar** (*get_entries) (const XfceRc *rc, const gchar *group);
- void (*delete_group) (XfceRc *rc, const gchar *group, gboolean global);
- const gchar* (*get_group) (const XfceRc *rc);
- gboolean (*has_group) (const XfceRc *rc, const gchar *group);
- void (*set_group) (XfceRc *rc, const gchar *group);
- void (*delete_entry) (XfceRc *rc, const gchar *key, gboolean global);
- gboolean (*has_entry) (const XfceRc *rc, const gchar *key);
- const gchar* (*read_entry) (const XfceRc *rc, const gchar *key,
- gboolean translated);
+ void (*close)(XfceRc *rc);
+ void (*flush)(XfceRc *rc);
+ void (*rollback) (XfceRc *rc);
+ gboolean (*is_dirty) (const XfceRc *rc);
+ gboolean (*is_readonly) (const XfceRc *rc);
+ gchar **(*get_groups) (const XfceRc *rc);
+ gchar **(*get_entries) (const XfceRc *rc,
+ const gchar *group);
+ void (*delete_group) (XfceRc *rc,
+ const gchar *group, gboolean global);
+ const gchar *(*get_group)(const XfceRc *rc);
+ gboolean (*has_group)(const XfceRc *rc,
+ const gchar *group);
+ void (*set_group)(XfceRc *rc,
+ const gchar *group);
+ void (*delete_entry) (XfceRc *rc,
+ const gchar *key,
+ gboolean global);
+ gboolean (*has_entry)(const XfceRc *rc,
+ const gchar *key);
+ const gchar *(*read_entry) (const XfceRc *rc,
+ const gchar *key,
+ gboolean translated);
/* write_entry == NULL means readonly */
- void (*write_entry) (XfceRc *rc, const gchar *key, const gchar *value);
+ void (*write_entry) (XfceRc *rc,
+ const gchar *key,
+ const gchar *value);
gchar *locale;
};
@@ -60,8 +70,8 @@ struct _XfceRc
G_GNUC_INTERNAL void _xfce_rc_init (XfceRc *rc);
G_GNUC_INTERNAL XfceRcSimple* _xfce_rc_simple_new (XfceRcSimple
*shared,
- const gchar *filename,
- gboolean readonly);
+ const gchar
*filename,
+ gboolean
readonly);
G_GNUC_INTERNAL gboolean _xfce_rc_simple_parse (XfceRcSimple
*simple);
G_GNUC_INTERNAL void _xfce_rc_simple_close (XfceRc *rc);
G_GNUC_INTERNAL void _xfce_rc_simple_flush (XfceRc *rc);
@@ -71,30 +81,30 @@ G_GNUC_INTERNAL gboolean _xfce_rc_simple_is_readonly
(const XfceRc *rc) G_G
G_GNUC_INTERNAL const gchar* _xfce_rc_simple_get_filename(const XfceRc *rc)
G_GNUC_CONST;
G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_groups (const XfceRc *rc)
G_GNUC_CONST;
G_GNUC_INTERNAL gchar** _xfce_rc_simple_get_entries (const XfceRc *rc,
- const gchar *name) G_GNUC_CONST;
+ const gchar *name)
G_GNUC_CONST;
G_GNUC_INTERNAL void _xfce_rc_simple_delete_group(XfceRc *rc,
- const gchar *name,
- gboolean global);
-const gchar* _xfce_rc_simple_get_group (const XfceRc *rc) G_GNUC_CONST;
+ const gchar *name,
+ gboolean
global);
+G_GNUC_INTERNAL const gchar* _xfce_rc_simple_get_group (const XfceRc *rc)
G_GNUC_CONST;
G_GNUC_INTERNAL gboolean _xfce_rc_simple_has_group (const XfceRc *rc,
-
[Xfce4-commits] Use some macros and drop unneeded strlen's.
Updating branch refs/heads/master
to e4300b75ae7ff06488241b7bc5c57ce9d9e45093 (commit)
from eef2d3ee83ae11fbaac75f7c0951c40a450d7624 (commit)
commit e4300b75ae7ff06488241b7bc5c57ce9d9e45093
Author: Nick Schermer
Date: Thu Jan 26 21:40:19 2012 +0100
Use some macros and drop unneeded strlen's.
libxfce4util/xfce-fileutils.c |6 +++---
libxfce4util/xfce-i18n.c |2 +-
libxfce4util/xfce-rc-config.c |5 ++---
libxfce4util/xfce-resource.c | 16
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/libxfce4util/xfce-fileutils.c b/libxfce4util/xfce-fileutils.c
index 8659860..51d5cb6 100644
--- a/libxfce4util/xfce-fileutils.c
+++ b/libxfce4util/xfce-fileutils.c
@@ -81,14 +81,14 @@ xfce_mkdirhier (const gchar *whole_path,
oumask = 0;
retval = TRUE;
- if (p[0] == '/') /* Skip leading '/'. */
+ if (p[0] == G_DIR_SEPARATOR) /* Skip leading '/'. */
++p;
for (first = 1, last = 0; !last ; ++p)
{
if (p[0] == '\0')
last = 1;
- else if (p[0] != '/')
+ else if (p[0] != G_DIR_SEPARATOR)
continue;
else if (p[1] == '\0')
last = 1;
@@ -137,7 +137,7 @@ xfce_mkdirhier (const gchar *whole_path,
}
if (!last)
-*p = '/';
+*p = G_DIR_SEPARATOR;
}
if (!first && !last)
diff --git a/libxfce4util/xfce-i18n.c b/libxfce4util/xfce-i18n.c
index 9c7f6d6..83468c1 100644
--- a/libxfce4util/xfce-i18n.c
+++ b/libxfce4util/xfce-i18n.c
@@ -95,7 +95,7 @@ xfce_localize_path_internal (gchar *buffer,
if (G_UNLIKELY (lang == NULL))
lang = getenv ("LANG");
- if (G_LIKELY (lang != NULL && strchr (path, '/') != NULL))
+ if (G_LIKELY (lang != NULL && strchr (path, G_DIR_SEPARATOR) != NULL))
{
/* ok, we will try four things here
* - full locale name: ll_LL@qualifier.encoding
diff --git a/libxfce4util/xfce-rc-config.c b/libxfce4util/xfce-rc-config.c
index 01a2eb9..fe41801 100644
--- a/libxfce4util/xfce-rc-config.c
+++ b/libxfce4util/xfce-rc-config.c
@@ -119,9 +119,8 @@ _xfce_rc_config_new (XfceResourceType type,
gchar **paths;
gchar **p;
- g_return_val_if_fail (resource != NULL, NULL);
- g_return_val_if_fail (strlen (resource) > 0, NULL);
- g_return_val_if_fail (resource[strlen (resource) - 1] != '/', NULL);
+ g_return_val_if_fail (resource != NULL && *resource != '\0', NULL);
+ g_return_val_if_fail (resource[strlen (resource) - 1] != G_DIR_SEPARATOR,
NULL);
user = xfce_resource_save_location (type, resource, FALSE);
paths = xfce_resource_lookup_all (type, resource);
diff --git a/libxfce4util/xfce-resource.c b/libxfce4util/xfce-resource.c
index 699790a..8116b6b 100644
--- a/libxfce4util/xfce-resource.c
+++ b/libxfce4util/xfce-resource.c
@@ -143,7 +143,7 @@ _res_remove_trailing_slashes (GList *list)
if (len <= 0)
{
/* A string with slashes only => root directory */
- ll = g_list_append (ll, g_strdup ("/"));
+ ll = g_list_append (ll, g_strdup (G_DIR_SEPARATOR_S));
g_free (lp->data);
}
else if (len < strlen (path))
@@ -287,10 +287,10 @@ _res_splitup_pattern (const gchar *pattern,
{
const gchar *p;
- if (*pattern == '\0' || *pattern == '/')
+ if (*pattern == '\0' || *pattern == G_DIR_SEPARATOR)
return FALSE;
- p = strchr (pattern, '/');
+ p = strchr (pattern, G_DIR_SEPARATOR);
if (p == NULL || *(p + 1) == '\0')
{
@@ -340,7 +340,7 @@ _res_match_path (const gchar *path,
{
guint end = strlen (pattern_this) - 1;
- if (pattern_this[end] == '/')
+ if (pattern_this[end] == G_DIR_SEPARATOR)
{
file_test = G_FILE_TEST_IS_DIR;
pattern_this[end] = '\0';
@@ -363,7 +363,7 @@ _res_match_path (const gchar *path,
{
if (g_file_test (filename, G_FILE_TEST_IS_DIR))
{
- child_relpath = g_strconcat (relpath, entry, "/", NULL);
+ child_relpath = g_strconcat (relpath, entry, G_DIR_SEPARATOR_S,
NULL);
list = _res_match_path (filename, child_relpath, pattern_child,
list);
g_free (child_relpath);
}
@@ -372,7 +372,7 @@ _res_match_path (const gchar *path,
{
if (file_test == G_FILE_TEST_IS_DIR)
{
- entries = g_list_append (entries, g_strconcat (relpath, entry,
"/", NULL));
+ entries = g_list_append (entries, g_strconcat (relpath, entry,
G_DIR_SEPARATOR_S, NULL));
}
else
{
@@ -475,7 +475,7 @@ xfce_resource_lookup (XfceResourceType type,
GList*l;
g_return_val_if_fail (TYPE_VALID (type), NULL);
- g_return_val_if_fail (filename != NULL && strlen (filename) > 0, NULL);
+ g_return_val_if_fail (filename != NULL && *filename != '\0', NULL);
_res_init ();
@@ -529,7 +529,7 @@ xfce_resource_lookup_all (XfceResourceType type,
GList*l;
g_return_val_if_fail (TYPE_V
[Xfce4-commits] Use GSList in xfce-resource.
Updating branch refs/heads/master
to 7819e8e1f79e51052bba725b3d901dfa74107b50 (commit)
from e4300b75ae7ff06488241b7bc5c57ce9d9e45093 (commit)
commit 7819e8e1f79e51052bba725b3d901dfa74107b50
Author: Nick Schermer
Date: Thu Jan 26 21:47:11 2012 +0100
Use GSList in xfce-resource.
libxfce4util/xfce-resource.c | 106 +-
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/libxfce4util/xfce-resource.c b/libxfce4util/xfce-resource.c
index 8116b6b..d39e6ad 100644
--- a/libxfce4util/xfce-resource.c
+++ b/libxfce4util/xfce-resource.c
@@ -47,7 +47,7 @@
static gchar* _save[5] = { NULL, NULL, NULL, NULL, NULL };
-static GList* _list[5] = { NULL, NULL, NULL, NULL, NULL };
+static GSList* _list[5] = { NULL, NULL, NULL, NULL, NULL };
static gboolean _inited = FALSE;
@@ -90,7 +90,7 @@ _res_split_and_append (const gchar *dir_list,
for (n = 0; dirs[n] != NULL; ++n)
{
if (g_path_is_absolute (dirs[n]))
-_list[type] = g_list_append (_list[type], dirs[n]);
+_list[type] = g_slist_append (_list[type], dirs[n]);
else
g_free (dirs[n]);
}
@@ -99,12 +99,12 @@ _res_split_and_append (const gchar *dir_list,
-static GList*
-_res_remove_duplicates (GList *list)
+static GSList*
+_res_remove_duplicates (GSList *list)
{
- GList *ll = NULL;
- GList *pp;
- GList *lp;
+ GSList *ll = NULL;
+ GSList *pp;
+ GSList *lp;
for (lp = list; lp != NULL; lp = lp->next)
{
@@ -113,22 +113,22 @@ _res_remove_duplicates (GList *list)
break;
if (pp == NULL)
-ll = g_list_append (ll, lp->data);
+ll = g_slist_append (ll, lp->data);
else
g_free (lp->data);
}
- g_list_free (list);
+ g_slist_free (list);
return ll;
}
-static GList*
-_res_remove_trailing_slashes (GList *list)
+static GSList*
+_res_remove_trailing_slashes (GSList *list)
{
- GList *ll = NULL;
- GList *lp;
+ GSList *ll = NULL;
+ GSList *lp;
const gchar *path;
gsizelen;
@@ -143,19 +143,19 @@ _res_remove_trailing_slashes (GList *list)
if (len <= 0)
{
/* A string with slashes only => root directory */
- ll = g_list_append (ll, g_strdup (G_DIR_SEPARATOR_S));
+ ll = g_slist_append (ll, g_strdup (G_DIR_SEPARATOR_S));
g_free (lp->data);
}
else if (len < strlen (path))
{
- ll = g_list_append (ll, g_strndup (path, len));
+ ll = g_slist_append (ll, g_strndup (path, len));
g_free (lp->data);
}
else
-ll = g_list_append (ll, lp->data);
+ll = g_slist_append (ll, lp->data);
}
- g_list_free (list);
+ g_slist_free (list);
return ll;
}
@@ -167,7 +167,7 @@ _res_init (void)
const gchar *dirs;
const gchar *dir;
gchar *path;
- GList *l;
+ GSList *l;
if (_inited)
return;
@@ -183,7 +183,7 @@ _res_init (void)
g_warning ("Invalid XDG_CACHE_HOME directory `%s', program may behave
incorrectly.", dir);
}
_save[XFCE_RESOURCE_CACHE] = g_strdup (dir);
- _list[XFCE_RESOURCE_CACHE] = g_list_prepend (_list[XFCE_RESOURCE_CACHE],
g_strdup (dir));
+ _list[XFCE_RESOURCE_CACHE] = g_slist_prepend (_list[XFCE_RESOURCE_CACHE],
g_strdup (dir));
/*
* Data home
@@ -194,7 +194,7 @@ _res_init (void)
g_warning ("Invalid XDG_DATA_HOME directory `%s', program may behave
incorrectly.", dir);
}
_save[XFCE_RESOURCE_DATA] = g_strdup (dir);
- _list[XFCE_RESOURCE_DATA] = g_list_prepend (_list[XFCE_RESOURCE_DATA],
g_strdup (dir));
+ _list[XFCE_RESOURCE_DATA] = g_slist_prepend (_list[XFCE_RESOURCE_DATA],
g_strdup (dir));
/*
* Config home
@@ -205,7 +205,7 @@ _res_init (void)
g_warning ("Invalid XDG_CONFIG_HOME directory `%s', program may behave
incorrectly.", dir);
}
_save[XFCE_RESOURCE_CONFIG] = g_strdup (dir);
- _list[XFCE_RESOURCE_CONFIG] = g_list_prepend (_list[XFCE_RESOURCE_CONFIG],
g_strdup (dir));
+ _list[XFCE_RESOURCE_CONFIG] = g_slist_prepend (_list[XFCE_RESOURCE_CONFIG],
g_strdup (dir));
/*
* Data dirs
@@ -227,36 +227,36 @@ _res_init (void)
/* local icons dir first */
path = g_build_filename (_save[XFCE_RESOURCE_DATA], "icons", NULL);
_save[XFCE_RESOURCE_ICONS] = g_strdup (path);
- _list[XFCE_RESOURCE_ICONS] = g_list_prepend (_list[XFCE_RESOURCE_ICONS],
path);
+ _list[XFCE_RESOURCE_ICONS] = g_slist_prepend (_list[XFCE_RESOURCE_ICONS],
path);
/* backward compatibility */
path = xfce_get_homefile (".icons", NULL);
- _list[XFCE_RESOURCE_ICONS] = g_list_append (_list[XFCE_RESOURCE_ICONS],
path);
+ _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS],
path);
for (l = _list[XFCE_RESOURCE_DATA]; l != NULL; l = l->next)
{
path = g_build_filename ((const gchar *) l->data, "icons", NULL);
- _list[XFCE_RESOURCE_ICONS] = g_list_append (_l
possibility to add parent widget in builder, and clear function in GtkComboBoxText, and more documentation, thanks to Jürgen Eder
Updating branch refs/heads/master to 6b6fa16607d5b29924a5037f427b6bee280fc763 (commit) from cd2a0e1195bed46054a34c2954a0c1cc4850b2f8 (commit) commit 6b6fa16607d5b29924a5037f427b6bee280fc763 Author: Bo Lorentsen Date: Thu Jan 26 22:35:07 2012 +0100 possibility to add parent widget in builder, and clear function in GtkComboBoxText, and more documentation, thanks to Jürgen Eder INSTALL | 220 + ui/xfc/gtk/builder.hh | 50 + ui/xfc/gtk/combobox.cc| 16 +++- ui/xfc/gtk/combobox.hh| 18 ui/xfc/gtk/inline/builder.inl | 45 + 5 files changed, 133 insertions(+), 216 deletions(-) diff --git a/INSTALL b/INSTALL index 54caf7c..a93c7ca 100644 --- a/INSTALL +++ b/INSTALL @@ -9,221 +9,11 @@ Basic Installation These are generic installation instructions. - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +To initialize the building system, the following command will do the needed : - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) + cmake . - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -= - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures - - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architectu
[Xfce4-commits] Readd support for pluggable dialogs.
Updating branch refs/heads/master
to af3fce560fe798740d58bbad32f63ff00a2a0c98 (commit)
from 9e77002585e580190827383f9a24c55bf2419221 (commit)
commit af3fce560fe798740d58bbad32f63ff00a2a0c98
Author: Nick Schermer
Date: Tue Jan 24 22:18:07 2012 +0100
Readd support for pluggable dialogs.
.../xfce-settings-manager-dialog.c | 245 +---
1 files changed, 213 insertions(+), 32 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index e668e7b..e5bcd7a 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -3,6 +3,7 @@
*
* Copyright (c) 2008 Brian Tarricone
* Jannis Pohlmann
+ * Copyright (c) 2012 Nick Schermer
*
* 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
@@ -40,7 +41,8 @@
#include "xfce-settings-manager-dialog.h"
#include "xfce-text-renderer.h"
-#define ITEM_WIDTH (128)
+#define TEXT_WIDTH (128)
+#define ICON_WIDTH (48)
@@ -48,14 +50,23 @@ struct _XfceSettingsManagerDialog
{
XfceTitledDialog __parent__;
-GarconMenu *menu;
+GarconMenu *menu;
-GtkListStore *store;
+GtkListStore *store;
-GtkWidget*category_box;
-GList*category_iconviews;
+GtkWidget *category_scroll;
+GtkWidget *category_box;
+GList *category_iconviews;
-GtkWidget*button_previous;
+GtkWidget *socket_scroll;
+GtkWidget *socket_viewport;
+GarconMenuItem *socket_item;
+
+GtkWidget *button_back;
+GtkWidget *button_help;
+
+gchar *help_page;
+gchar *help_component;
};
struct _XfceSettingsManagerDialogClass
@@ -82,6 +93,7 @@ static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog
const gchar
*title,
const gchar
*icon_name,
const gchar
*subtitle);
+static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
static void xfce_settings_manager_dialog_menu_reload
(XfceSettingsManagerDialog *dialog);
@@ -109,7 +121,8 @@ static void
xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
{
GtkWidget *scroll;
-GtkWidget *area;
+GtkWidget *dialog_vbox;
+GtkWidget *bbox;
GtkWidget *viewport;
GtkWidget *vbox;
gchar *path;
@@ -127,23 +140,25 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500);
xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
-
-dialog->button_previous = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK,
_("_All Settings"));
-area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-gtk_container_add (GTK_CONTAINER (area), dialog->button_previous);
-gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (area),
dialog->button_previous, TRUE);
-gtk_widget_set_sensitive (dialog->button_previous, FALSE);
-gtk_widget_show (dialog->button_previous);
-
-gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL);
-
-scroll = gtk_scrolled_window_new (NULL, NULL);
+dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK,
_("_All Settings"));
+bbox = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+gtk_container_add (GTK_CONTAINER (bbox), dialog->button_back);
+gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (bbox),
dialog->button_back, TRUE);
+gtk_widget_set_sensitive (dialog->button_back, FALSE);
+gtk_widget_show (dialog->button_back);
+g_signal_connect_swapped (G_OBJECT (dialog->button_back), "clicked",
+G_CALLBACK (xfce_settings_manager_dialog_go_back), dialog);
+
+dialog->button_help = gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_HELP,
GTK_RESPONSE_HELP);
+gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE);
+
+dialog->category_scroll = scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-gtk_container_add (GTK_CONTAINER (area), scroll);
+gtk_container_add (GTK_CONTAINER (
[Xfce4-commits] Fix base style and start cursor earlier.
Updating branch refs/heads/master
to 8f4cd06705581b8b8f8ab1b1212c6e7b118e594f (commit)
from af3fce560fe798740d58bbad32f63ff00a2a0c98 (commit)
commit 8f4cd06705581b8b8f8ab1b1212c6e7b118e594f
Author: Nick Schermer
Date: Tue Jan 24 23:39:29 2012 +0100
Fix base style and start cursor earlier.
.../xfce-settings-manager-dialog.c | 44 ++-
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index e5bcd7a..29fdac2 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -54,6 +54,7 @@ struct _XfceSettingsManagerDialog
GtkListStore *store;
+GtkWidget *category_viewport;
GtkWidget *category_scroll;
GtkWidget *category_box;
GList *category_iconviews;
@@ -87,6 +88,8 @@ enum
static void xfce_settings_manager_dialog_finalize(GObject
*object);
+static void xfce_settings_manager_dialog_style_set (GtkWidget
*widget,
+ GtkStyle
*old_style);
static void xfce_settings_manager_dialog_response(GtkDialog
*widget,
gint
response_id);
static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
@@ -107,10 +110,14 @@ xfce_settings_manager_dialog_class_init
(XfceSettingsManagerDialogClass *klass)
{
GObjectClass *gobject_class;
GtkDialogClass *gtkdialog_class;
+GtkWidgetClass *gtkwiget_class;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = xfce_settings_manager_dialog_finalize;
+gtkwiget_class = GTK_WIDGET_CLASS (klass);
+gtkwiget_class->style_set = xfce_settings_manager_dialog_style_set;
+
gtkdialog_class = GTK_DIALOG_CLASS (klass);
gtkdialog_class->response = xfce_settings_manager_dialog_response;
}
@@ -162,10 +169,9 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
gtk_container_set_border_width (GTK_CONTAINER (scroll), 6);
gtk_widget_show (scroll);
-viewport = gtk_viewport_new (NULL, NULL);
+viewport = dialog->category_viewport = gtk_viewport_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scroll), viewport);
gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-gtk_widget_modify_bg (viewport, GTK_STATE_NORMAL, &viewport->style->white);
gtk_widget_show (viewport);
dialog->category_box = vbox = gtk_vbox_new (FALSE, 6);
@@ -187,7 +193,6 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
dialog->socket_viewport = viewport = gtk_viewport_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scroll), viewport);
gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-gtk_widget_modify_bg (viewport, GTK_STATE_NORMAL, &viewport->style->white);
gtk_widget_show (viewport);
xfce_settings_manager_dialog_menu_reload (dialog);
@@ -218,6 +223,22 @@ xfce_settings_manager_dialog_finalize (GObject *object)
static void
+xfce_settings_manager_dialog_style_set (GtkWidget *widget,
+GtkStyle *old_style)
+{
+XfceSettingsManagerDialog *dialog = XFCE_SETTINGS_MANAGER_DIALOG (widget);
+
+GTK_WIDGET_CLASS (xfce_settings_manager_dialog_parent_class)->style_set
(widget, old_style);
+
+/* set viewport to color icon view uses for background */
+gtk_widget_modify_bg (dialog->category_viewport,
+ GTK_STATE_NORMAL,
+ &widget->style->base[GTK_STATE_NORMAL]);
+}
+
+
+
+static void
xfce_settings_manager_dialog_response (GtkDialog *widget,
gint response_id)
{
@@ -547,6 +568,11 @@ xfce_settings_manager_dialog_item_activated (ExoIconView
*iconview
if (pluggable)
{
+/* fake startup notification */
+cursor = gdk_cursor_new (GDK_WATCH);
+gdk_window_set_cursor (GTK_WIDGET (dialog)->window, cursor);
+gdk_cursor_unref (cursor);
+
/* create fresh socket */
socket = gtk_socket_new ();
gtk_container_add (GTK_CONTAINER (dialog->socket_viewport),
socket);
@@ -561,16 +587,10 @@ xfce_settings_manager_dialog_item_activated (ExoIconView
*iconview
/* spawn dialog with socket argument */
cmd = g_strdup_printf ("%s --socket-id=%d", command,
gtk_socket_get_id (GTK_SOCKET (socket)));
-if (xfce_spawn_command_line_on_screen (screen, cmd, FALSE, FALSE,
&error))
+if (!xfce_spawn_command_line_on_screen (screen, cmd, FALSE, FALSE,
&error))
{
-
[Xfce4-commits] Separate category contents and titles using a horizontal line.
Updating branch refs/heads/master
to 4fd11e18704b46c70846b8cd3d01bf9689f1487c (commit)
from 8f4cd06705581b8b8f8ab1b1212c6e7b118e594f (commit)
commit 4fd11e18704b46c70846b8cd3d01bf9689f1487c
Author: Jannis Pohlmann
Date: Wed Jan 25 15:42:51 2012 +
Separate category contents and titles using a horizontal line.
.../xfce-settings-manager-dialog.c | 31 ++--
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 29fdac2..097ba4f 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -636,9 +636,11 @@ xfce_settings_manager_dialog_add_category
(XfceSettingsManagerDialog *dialog,
GarconMenuDirectory
*directory)
{
GtkTreeModel*filter;
-GtkWidget *frame;
-GtkWidget *label;
+GtkWidget *alignment;
GtkWidget *iconview;
+GtkWidget *label;
+GtkWidget *separator;
+GtkWidget *vbox;
PangoAttrList *attrs;
GtkCellRenderer *render;
@@ -648,22 +650,33 @@ xfce_settings_manager_dialog_add_category
(XfceSettingsManagerDialog *dialog,
xfce_settings_manager_dialog_filter_category,
g_object_ref (directory), g_object_unref);
-frame = gtk_frame_new (NULL);
-gtk_box_pack_start (GTK_BOX (dialog->category_box), frame, FALSE, TRUE, 0);
-gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-gtk_container_set_resize_mode (GTK_CONTAINER (frame),
GTK_RESIZE_IMMEDIATE);
-gtk_widget_show (frame);
+vbox = gtk_vbox_new (FALSE, 0);
+gtk_box_pack_start (GTK_BOX (dialog->category_box), vbox, FALSE, TRUE, 0);
+gtk_widget_show (vbox);
+/* create a label for the category title */
label = gtk_label_new (garcon_menu_directory_get_name (directory));
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
gtk_label_set_attributes (GTK_LABEL (label), attrs);
pango_attr_list_unref (attrs);
-gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
+/* separate title and content using a horizontal line */
+separator = gtk_hseparator_new ();
+gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0);
+gtk_widget_show (separator);
+
+/* use an alignment to separate the category content from the title */
+alignment = gtk_alignment_new (0.0f, 0.0f, 1.0f, 1.0f);
+gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+gtk_container_add (GTK_CONTAINER (vbox), alignment);
+gtk_widget_show (alignment);
+
iconview = exo_icon_view_new_with_model (GTK_TREE_MODEL (filter));
-gtk_container_add (GTK_CONTAINER (frame), iconview);
+gtk_container_add (GTK_CONTAINER (alignment), iconview);
exo_icon_view_set_orientation (EXO_ICON_VIEW (iconview),
GTK_ORIENTATION_HORIZONTAL);
exo_icon_view_set_margin (EXO_ICON_VIEW (iconview), 0);
exo_icon_view_set_single_click (EXO_ICON_VIEW (iconview), TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add non-functional search entry.
Updating branch refs/heads/master
to b4d377399ba6fbe322876ebe308bc2743bc21f41 (commit)
from 4fd11e18704b46c70846b8cd3d01bf9689f1487c (commit)
commit b4d377399ba6fbe322876ebe308bc2743bc21f41
Author: Nick Schermer
Date: Wed Jan 25 21:12:40 2012 +0100
Add non-functional search entry.
.../xfce-settings-manager-dialog.c | 100 +++-
1 files changed, 78 insertions(+), 22 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 097ba4f..65c399d 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -54,6 +54,8 @@ struct _XfceSettingsManagerDialog
GtkListStore *store;
+GtkWidget *search_entry;
+
GtkWidget *category_viewport;
GtkWidget *category_scroll;
GtkWidget *category_box;
@@ -87,17 +89,20 @@ enum
-static void xfce_settings_manager_dialog_finalize(GObject
*object);
-static void xfce_settings_manager_dialog_style_set (GtkWidget
*widget,
- GtkStyle
*old_style);
-static void xfce_settings_manager_dialog_response(GtkDialog
*widget,
- gint
response_id);
-static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
- const gchar
*title,
- const gchar
*icon_name,
- const gchar
*subtitle);
-static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
-static void xfce_settings_manager_dialog_menu_reload
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_finalize (GObject
*object);
+static void xfce_settings_manager_dialog_style_set(GtkWidget
*widget,
+ GtkStyle
*old_style);
+static void xfce_settings_manager_dialog_response (GtkDialog
*widget,
+ gint
response_id);
+static void xfce_settings_manager_dialog_header_style (GtkWidget
*header,
+ GtkStyle
*old_style,
+ GtkWidget
*ebox);
+static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
+ const gchar
*title,
+ const gchar
*icon_name,
+ const gchar
*subtitle);
+static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_menu_reload
(XfceSettingsManagerDialog *dialog);
@@ -129,10 +134,15 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
{
GtkWidget *scroll;
GtkWidget *dialog_vbox;
-GtkWidget *bbox;
GtkWidget *viewport;
-GtkWidget *vbox;
gchar *path;
+GtkWidget *hbox;
+GtkWidget *entry;
+GtkWidget *align;
+GList *children;
+GtkWidget *header;
+GtkWidget *ebox;
+GtkWidget *bbox;
dialog->store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
@@ -147,12 +157,10 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500);
xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
-dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK,
_("_All Settings"));
bbox = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
gtk_container_add (GTK_CONTAINER (bbox), dialog->button_back);
-gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (bbox),
dialog->button_back, TRUE);
gtk_widget_set_sensitive (dialog->button_back, FALSE);
gtk_widget_show (dialog->button_back);
g_signal_connect_swapped (G_OBJECT (dialog->button_back), "clicked",
@@ -162,10 +170,45 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
GTK_STOCK_HELP,
GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE);
+/* add box at start of the main box */
+hbox = gtk_hbox_new (FALSE, 0);
+dialog_vbox = gt
[Xfce4-commits] Restore the --dialog option.
Updating branch refs/heads/master
to 8820f1a8b71a722490edf3db555930efda1579ee (commit)
from b4d377399ba6fbe322876ebe308bc2743bc21f41 (commit)
commit 8820f1a8b71a722490edf3db555930efda1579ee
Author: Nick Schermer
Date: Wed Jan 25 21:31:47 2012 +0100
Restore the --dialog option.
xfce4-settings-manager/main.c |7 +-
.../xfce-settings-manager-dialog.c | 180
.../xfce-settings-manager-dialog.h |2 +-
3 files changed, 118 insertions(+), 71 deletions(-)
diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c
index 1e29a31..9ebab31 100644
--- a/xfce4-settings-manager/main.c
+++ b/xfce4-settings-manager/main.c
@@ -91,8 +91,11 @@ main(int argc,
gtk_widget_show(dialog);
if(opt_dialog != NULL) {
-
xfce_settings_manager_dialog_show_dialog(XFCE_SETTINGS_MANAGER_DIALOG(dialog),
- opt_dialog);
+if
(!xfce_settings_manager_dialog_show_dialog(XFCE_SETTINGS_MANAGER_DIALOG(dialog),
+ opt_dialog))
+{
+g_message ("Dialog \"%s\" not found.", opt_dialog);
+}
}
/* To prevent the settings dialog to be saved in the session */
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 65c399d..5f6a8d6 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -574,13 +574,9 @@ xfce_settings_manager_dialog_plug_removed (GtkWidget
*socket,
static void
-xfce_settings_manager_dialog_item_activated (ExoIconView
*iconview,
- GtkTreePath *path,
- XfceSettingsManagerDialog *dialog)
+xfce_settings_manager_dialog_spawn (XfceSettingsManagerDialog *dialog,
+GarconMenuItem*item)
{
-GtkTreeModel *model;
-GtkTreeIter iter;
-GarconMenuItem *item;
const gchar*command;
gbooleansnotify;
GdkScreen *screen;
@@ -593,83 +589,99 @@ xfce_settings_manager_dialog_item_activated (ExoIconView
*iconview
GtkWidget *socket;
GdkCursor *cursor;
-model = exo_icon_view_get_model (iconview);
-if (gtk_tree_model_get_iter (model, &iter, path))
-{
-gtk_tree_model_get (model, &iter, COLUMN_MENU_ITEM, &item, -1);
-g_assert (GARCON_IS_MENU_ITEM (item));
+g_return_if_fail (GARCON_IS_MENU_ITEM (item));
-screen = gtk_window_get_screen (GTK_WINDOW (dialog));
-command = garcon_menu_item_get_command (item);
+screen = gtk_window_get_screen (GTK_WINDOW (dialog));
+command = garcon_menu_item_get_command (item);
-/* we need to read some more info from the desktop
- * file that is not supported by garcon */
-desktop_file = garcon_menu_item_get_file (item);
-filename = g_file_get_path (desktop_file);
-g_object_unref (desktop_file);
+/* we need to read some more info from the desktop
+ * file that is not supported by garcon */
+desktop_file = garcon_menu_item_get_file (item);
+filename = g_file_get_path (desktop_file);
+g_object_unref (desktop_file);
-rc = xfce_rc_simple_open (filename, TRUE);
-g_free (filename);
-if (G_LIKELY (rc != NULL))
+rc = xfce_rc_simple_open (filename, TRUE);
+g_free (filename);
+if (G_LIKELY (rc != NULL))
+{
+pluggable = xfce_rc_read_bool_entry (rc, "X-XfcePluggable", FALSE);
+if (pluggable)
{
-pluggable = xfce_rc_read_bool_entry (rc, "X-XfcePluggable", FALSE);
-if (pluggable)
-{
-dialog->help_page = g_strdup (xfce_rc_read_entry (rc,
"X-XfceHelpPage", NULL));
-dialog->help_component = g_strdup (xfce_rc_read_entry (rc,
"X-XfceHelpComponent", NULL));
-}
-
-xfce_rc_close (rc);
+dialog->help_page = g_strdup (xfce_rc_read_entry (rc,
"X-XfceHelpPage", NULL));
+dialog->help_component = g_strdup (xfce_rc_read_entry (rc,
"X-XfceHelpComponent", NULL));
}
-if (pluggable)
+xfce_rc_close (rc);
+}
+
+if (pluggable)
+{
+/* fake startup notification */
+cursor = gdk_cursor_new (GDK_WATCH);
+gdk_window_set_cursor (GTK_WIDGET (dialog)->window, cursor);
+gdk_cursor_unref (cursor);
+
+/* create fresh socket */
+socket = gtk_socket_new ();
+gtk_container_add (GTK_CONTAINER (dialog->socket_viewport), socket);
+g_signal_connect (G_OBJECT (socket), "plug-added",
+G_CALLBACK (xfce_settings_manager_dialog_plug_added), dialog);
+g_signal_connect (G_OBJECT (socket), "pl
[Xfce4-commits] Cleanup main.
Updating branch refs/heads/master
to 7f954295cc6ab05819b52ce126c8462c1b98ff76 (commit)
from 8820f1a8b71a722490edf3db555930efda1579ee (commit)
commit 7f954295cc6ab05819b52ce126c8462c1b98ff76
Author: Nick Schermer
Date: Wed Jan 25 21:37:40 2012 +0100
Cleanup main.
xfce4-settings-manager/Makefile.am |2 -
xfce4-settings-manager/main.c | 77
.../xfce-settings-manager-dialog.c |1 -
3 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/xfce4-settings-manager/Makefile.am
b/xfce4-settings-manager/Makefile.am
index 84acfee..2fee266 100644
--- a/xfce4-settings-manager/Makefile.am
+++ b/xfce4-settings-manager/Makefile.am
@@ -20,7 +20,6 @@ xfce4_settings_manager_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
- $(XFCONF_CFLAGS) \
$(GARCON_CFLAGS) \
$(EXO_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -33,7 +32,6 @@ xfce4_settings_manager_LDADD = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
- $(XFCONF_LIBS) \
$(EXO_LIBS) \
$(GARCON_LIBS)
diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c
index 9ebab31..3a65879 100644
--- a/xfce4-settings-manager/main.c
+++ b/xfce4-settings-manager/main.c
@@ -26,7 +26,6 @@
#endif
#include
-#include
#include
#include
@@ -35,67 +34,60 @@
static gboolean opt_version = FALSE;
static gchar *opt_dialog = NULL;
-static GOptionEntry option_entries[] = {
-{ "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version,
- N_("Version information"), NULL },
-{ "dialog", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &opt_dialog,
- N_("Settings dialog to show"), NULL },
+static GOptionEntry option_entries[] =
+{
+{ "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version,
N_("Version information"), NULL },
+{ "dialog", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &opt_dialog,
N_("Settings dialog to show"), NULL },
{ NULL }
};
+
+
int
main(int argc,
char **argv)
{
GtkWidget *dialog;
-GError *error = NULL;
+GError*error = NULL;
xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-if(!gtk_init_with_args(&argc, &argv, "", option_entries, GETTEXT_PACKAGE,
&error)) {
-if(G_LIKELY(error)) {
-g_print("%s: %s.\n", G_LOG_DOMAIN, error->message);
-g_print(_("Type '%s --help' for usage."), G_LOG_DOMAIN);
-g_print("\n");
+if (!gtk_init_with_args (&argc, &argv, NULL, option_entries,
GETTEXT_PACKAGE, &error))
+{
+if (G_LIKELY (error != NULL))
+{
+g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
+g_print ("\n");
-g_error_free(error);
-} else {
-g_error("Unable to open display.");
+g_error_free (error);
+}
+else
+{
+g_error ("Unable to open display.");
}
return EXIT_FAILURE;
}
-if(G_UNLIKELY(opt_version)) {
-g_print("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION,
xfce_version_string());
-g_print("%s\n", "Copyright (c) 2008-2011");
-g_print("\t%s\n\n", _("The Xfce development team. All rights
reserved."));
-g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
-g_print("\n");
+if (G_UNLIKELY (opt_version))
+{
+g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION,
xfce_version_string());
+g_print ("%s\n", "Copyright (c) 2008-2011");
+g_print ("\t%s\n\n", _("The Xfce development team. All rights
reserved."));
+g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
+g_print ("\n");
return EXIT_SUCCESS;
}
-if(G_UNLIKELY(!xfconf_init (&error))) {
-if(G_LIKELY(error != NULL)) {
-g_error("%s: Failed to initialize xfconf: %s.\n", G_LOG_DOMAIN,
-error->message);
-g_error_free(error);
-} else {
-g_error("Failed to initialize xfconf.");
-}
-return EXIT_FAILURE;
-}
-
garcon_set_environment ("XFCE");
-dialog = xfce_settings_manager_dialog_new();
-gtk_widget_show(dialog);
+dialog = xfce_settings_manager_dialog_new ();
+gtk_window_present (GTK_WINDOW (dialog));
-if(opt_dialog != NULL) {
-if
(!xfce_settings_manager_dialog_show_dialog(XFCE_SETTINGS_MANAGER_DIALOG(dialog),
- opt_dialog))
-{
-g_message ("Dialog \"%s\" not found.", opt_dialog);
-}
+if (opt_dialog != NULL
+&& !xfce_settings_manager_dialog_show_dialog
(XFCE_SETTINGS_MANAGER_DIALOG(dialog), opt_dialog))
+{
+g_message ("Dialog \"%s\" not
[Xfce4-commits] Simulate scrolling when item is selected.
Updating branch refs/heads/master
to 5eaa8c9ecc3abd22b618bb39b5b301e6880a8864 (commit)
from 7f954295cc6ab05819b52ce126c8462c1b98ff76 (commit)
commit 5eaa8c9ecc3abd22b618bb39b5b301e6880a8864
Author: Nick Schermer
Date: Wed Jan 25 22:17:55 2012 +0100
Simulate scrolling when item is selected.
Normal scrolling is not working because of the strange
packing of widgets, so simulate this.
.../xfce-settings-manager-dialog.c | 36
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 42d1e5d..70ee927 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -699,6 +699,40 @@ xfce_settings_manager_dialog_filter_category (GtkTreeModel
*model,
static void
+xfce_settings_manager_dialog_selection_changed (ExoIconView
*iconview,
+XfceSettingsManagerDialog
*dialog)
+{
+GtkAllocation *alloc = >K_WIDGET (iconview)->allocation;
+GtkTreePath *path;
+gint row, row_height;
+gdoublerows;
+GtkAdjustment *adjustment;
+gdoublelower, upper;
+
+if (gtk_widget_has_focus (GTK_WIDGET (iconview))
+&& exo_icon_view_get_cursor (iconview, &path, NULL))
+{
+/* get item row */
+row = exo_icon_view_get_item_row (iconview, path);
+gtk_tree_path_free (path);
+
+/* estinated row height */
+rows = alloc->height / 56;
+row_height = alloc->height / MAX (1.0, (gint) rows);
+
+/* selected item boundries */
+lower = alloc->y + row_height * row;
+upper = alloc->y + row_height * (row + 1);
+
+/* scroll so item is visible */
+adjustment = gtk_viewport_get_vadjustment (GTK_VIEWPORT
(dialog->category_viewport));
+gtk_adjustment_clamp_page (adjustment, lower, upper);
+}
+}
+
+
+
+static void
xfce_settings_manager_dialog_add_category (XfceSettingsManagerDialog *dialog,
GarconMenuDirectory
*directory)
{
@@ -765,6 +799,8 @@ xfce_settings_manager_dialog_add_category
(XfceSettingsManagerDialog *dialog,
G_CALLBACK (xfce_settings_manager_dialog_iconview_keynav_failed),
dialog);
g_signal_connect (G_OBJECT (iconview), "item-activated",
G_CALLBACK (xfce_settings_manager_dialog_item_activated), dialog);
+g_signal_connect (G_OBJECT (iconview), "selection-changed",
+G_CALLBACK (xfce_settings_manager_dialog_selection_changed), dialog);
render = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (iconview), render, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Directly activate item if it's the only visible item.
Updating branch refs/heads/master
to c18f2be0773a79f173f95c5bb76b51c1e68c037f (commit)
from eda1f1fd5b6d733cc41c9817350b87f745e3280e (commit)
commit c18f2be0773a79f173f95c5bb76b51c1e68c037f
Author: Nick Schermer
Date: Thu Jan 26 19:32:57 2012 +0100
Directly activate item if it's the only visible item.
.../xfce-settings-manager-dialog.c | 35 +--
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 0f34ad8..ae0e507 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -653,6 +653,8 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
GList *li;
DialogCategory *category;
GtkTreePath*path;
+gintn_visible_items;
+GtkTreeModel *model;
if (event->keyval == GDK_Escape)
{
@@ -662,6 +664,22 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
}
else if (event->keyval == GDK_Return)
{
+/* count visible children */
+n_visible_items = 0;
+for (li = dialog->categories; li != NULL; li = li->next)
+{
+category = li->data;
+if (gtk_widget_get_visible (category->box))
+{
+model = exo_icon_view_get_model (EXO_ICON_VIEW
(category->iconview));
+n_visible_items += gtk_tree_model_iter_n_children (model,
NULL);
+
+/* stop searching if there are more then 1 items */
+if (n_visible_items > 1)
+break;
+}
+}
+
for (li = dialog->categories; li != NULL; li = li->next)
{
category = li->data;
@@ -670,12 +688,21 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
if (!gtk_widget_get_visible (category->box))
continue;
-/* select first item */
+
path = gtk_tree_path_new_first ();
-exo_icon_view_set_cursor (EXO_ICON_VIEW (category->iconview),
path, NULL, FALSE);
+if (n_visible_items == 1)
+{
+/* activate this one item */
+exo_icon_view_item_activated (EXO_ICON_VIEW
(category->iconview), path);
+}
+else
+{
+/* select first item in view */
+exo_icon_view_set_cursor (EXO_ICON_VIEW (category->iconview),
+ path, NULL, FALSE);
+gtk_widget_grab_focus (category->iconview);
+}
gtk_tree_path_free (path);
-
-gtk_widget_grab_focus (category->iconview);
break;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Properly destroy dialog on exit.
Updating branch refs/heads/master
to 339aa7dcac4f4041597a5dbf8264fc78e8550923 (commit)
from c18f2be0773a79f173f95c5bb76b51c1e68c037f (commit)
commit 339aa7dcac4f4041597a5dbf8264fc78e8550923
Author: Nick Schermer
Date: Thu Jan 26 19:39:19 2012 +0100
Properly destroy dialog on exit.
.../xfce-settings-manager-dialog.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index ae0e507..f55bceb 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -332,6 +332,7 @@ xfce_settings_manager_dialog_response (GtkDialog *widget,
}
else
{
+gtk_widget_destroy (GTK_WIDGET (widget));
gtk_main_quit ();
}
}
@@ -688,7 +689,6 @@ xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
if (!gtk_widget_get_visible (category->box))
continue;
-
path = gtk_tree_path_new_first ();
if (n_visible_items == 1)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix key navigation with hidden categories.
Updating branch refs/heads/master
to a5800782880dcc7a9b174bd489517d686ff4471c (commit)
from 339aa7dcac4f4041597a5dbf8264fc78e8550923 (commit)
commit a5800782880dcc7a9b174bd489517d686ff4471c
Author: Nick Schermer
Date: Thu Jan 26 19:48:10 2012 +0100
Fix key navigation with hidden categories.
.../xfce-settings-manager-dialog.c | 23 +++
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index f55bceb..b7fe5d4 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -401,14 +401,27 @@ xfce_settings_manager_dialog_iconview_keynav_failed
(ExoIconView *
if (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN)
{
+/* find this category in the list */
li = g_list_find_custom (dialog->categories, current_view,
xfce_settings_manager_dialog_iconview_find);
-if (direction == GTK_DIR_DOWN)
-li = g_list_next (li);
-else
-li = g_list_previous (li);
-/* leave there is no view obove or below this one */
+/* find the next of previous visible item */
+for (; li != NULL; )
+{
+if (direction == GTK_DIR_DOWN)
+li = g_list_next (li);
+else
+li = g_list_previous (li);
+
+if (li != NULL)
+{
+category = li->data;
+if (gtk_widget_get_visible (category->box))
+break;
+}
+}
+
+/* leave there is no view above or below this one */
if (li == NULL)
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make filtering work.
Updating branch refs/heads/master
to eda1f1fd5b6d733cc41c9817350b87f745e3280e (commit)
from 5eaa8c9ecc3abd22b618bb39b5b301e6880a8864 (commit)
commit eda1f1fd5b6d733cc41c9817350b87f745e3280e
Author: Nick Schermer
Date: Thu Jan 26 19:24:21 2012 +0100
Make filtering work.
.../xfce-settings-manager-dialog.c | 301 +---
1 files changed, 255 insertions(+), 46 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 70ee927..0f34ad8 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -31,6 +31,7 @@
#endif
#include
+#include
#include
#include
@@ -45,6 +46,11 @@
+struct _XfceSettingsManagerDialogClass
+{
+XfceTitledDialogClass __parent__;
+};
+
struct _XfceSettingsManagerDialog
{
XfceTitledDialog __parent__;
@@ -53,12 +59,14 @@ struct _XfceSettingsManagerDialog
GtkListStore *store;
-GtkWidget *search_entry;
+GtkWidget *filter_entry;
+gchar *filter_text;
GtkWidget *category_viewport;
GtkWidget *category_scroll;
GtkWidget *category_box;
-GList *category_iconviews;
+
+GList *categories;
GtkWidget *socket_scroll;
GtkWidget *socket_viewport;
@@ -71,10 +79,16 @@ struct _XfceSettingsManagerDialog
gchar *help_component;
};
-struct _XfceSettingsManagerDialogClass
+typedef struct
{
-XfceTitledDialogClass __parent__;
-};
+GarconMenuDirectory *directory;
+XfceSettingsManagerDialog *dialog;
+GtkWidget *iconview;
+GtkWidget *box;
+}
+DialogCategory;
+
+
enum
{
@@ -83,25 +97,34 @@ enum
COLUMN_TOOLTIP,
COLUMN_MENU_ITEM,
COLUMN_MENU_DIRECTORY,
+COLUMN_FILTER_TEXT,
N_COLUMNS
};
-static void xfce_settings_manager_dialog_finalize (GObject
*object);
-static void xfce_settings_manager_dialog_style_set(GtkWidget
*widget,
- GtkStyle
*old_style);
-static void xfce_settings_manager_dialog_response (GtkDialog
*widget,
- gint
response_id);
-static void xfce_settings_manager_dialog_header_style (GtkWidget
*header,
- GtkStyle
*old_style,
- GtkWidget
*ebox);
-static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
- const gchar
*title,
- const gchar
*icon_name,
- const gchar
*subtitle);
-static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
-static void xfce_settings_manager_dialog_menu_reload
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_finalize(GObject
*object);
+static void xfce_settings_manager_dialog_style_set (GtkWidget
*widget,
+ GtkStyle
*old_style);
+static void xfce_settings_manager_dialog_response(GtkDialog
*widget,
+ gint
response_id);
+static void xfce_settings_manager_dialog_header_style(GtkWidget
*header,
+ GtkStyle
*old_style,
+ GtkWidget
*ebox);
+static void xfce_settings_manager_dialog_set_title
(XfceSettingsManagerDialog *dialog,
+ const gchar
*title,
+ const gchar
*icon_name,
+ const gchar
*subtitle);
+static void xfce_settings_manager_dialog_go_back
(XfceSettingsManagerDialog *dialog);
+static void xfce_settings_manager_dialog_entry_changed (GtkWidget
*entry,
+
XfceSettingsManagerDialog *dialog);
+static gboolean xfce_settings_manager_dialog_entry_key_press (GtkWidget
*entry,
+ GdkEventKey
*event,
+
[Xfce4-commits] Clear and focus filter entry when returning to all settings.
Updating branch refs/heads/master to efa7a0abf3d166d1dc68ba3ee0187bfea3a06ebb (commit) from a5800782880dcc7a9b174bd489517d686ff4471c (commit) commit efa7a0abf3d166d1dc68ba3ee0187bfea3a06ebb Author: Nick Schermer Date: Thu Jan 26 19:59:16 2012 +0100 Clear and focus filter entry when returning to all settings. .../xfce-settings-manager-dialog.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c index b7fe5d4..45f4b9e 100644 --- a/xfce4-settings-manager/xfce-settings-manager-dialog.c +++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c @@ -578,7 +578,10 @@ xfce_settings_manager_dialog_go_back (XfceSettingsManagerDialog *dialog) gtk_widget_set_sensitive (dialog->button_back, FALSE); gtk_widget_set_sensitive (dialog->button_help, TRUE); + gtk_widget_set_sensitive (dialog->filter_entry, TRUE); +gtk_entry_set_text (GTK_ENTRY (dialog->filter_entry), ""); +gtk_widget_grab_focus (dialog->filter_entry); socket = gtk_bin_get_child (GTK_BIN (dialog->socket_viewport)); if (G_LIKELY (socket != NULL)) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Attach start-interactive-search.
Updating branch refs/heads/master
to ae73197178941104404773cd798a1b10a17ea7e7 (commit)
from efa7a0abf3d166d1dc68ba3ee0187bfea3a06ebb (commit)
commit ae73197178941104404773cd798a1b10a17ea7e7
Author: Nick Schermer
Date: Thu Jan 26 20:06:27 2012 +0100
Attach start-interactive-search.
.../xfce-settings-manager-dialog.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 45f4b9e..2c3c3fd 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -953,6 +953,16 @@ xfce_settings_manager_dialog_selection_changed
(ExoIconView *iconv
+static gboolean
+xfce_settings_manager_start_search (GtkWidget *iconview,
+XfceSettingsManagerDialog *dialog)
+{
+gtk_widget_grab_focus (dialog->filter_entry);
+return TRUE;
+}
+
+
+
static void
xfce_settings_manager_dialog_category_free (gpointer data)
{
@@ -1038,6 +1048,8 @@ xfce_settings_manager_dialog_add_category
(XfceSettingsManagerDialog *dialog,
G_CALLBACK (xfce_settings_manager_dialog_item_activated), dialog);
g_signal_connect (G_OBJECT (iconview), "selection-changed",
G_CALLBACK (xfce_settings_manager_dialog_selection_changed), dialog);
+g_signal_connect (G_OBJECT (iconview), "start-interactive-search",
+G_CALLBACK (xfce_settings_manager_start_search), dialog);
render = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (iconview), render, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/settings-manager
Deleting branch refs/heads/nick/settings-manager ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to b85a3fe583c4913ab6edcd2d4b1fe1026be18d65 (commit) from f0d84d1f9c3afee2283753b276d608cf007e36fe (commit) commit b85a3fe583c4913ab6edcd2d4b1fe1026be18d65 Author: Bauzhan Muftakhidinov Date: Fri Jan 27 06:44:03 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 24 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/po/kk.po b/po/kk.po index c09b676..7e60494 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-25 10:06+\n" +"POT-Creation-Date: 2012-01-27 01:24+\n" "PO-Revision-Date: 2010-03-11 12:39+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -57,6 +57,14 @@ msgstr "Бейнелеу" msgid "Graphics creation and manipulation applications" msgstr "Суреттерді жасау мен өндеу құралдары" +#: ../data/xfce/xfce-hardware.directory.in.h:1 +msgid "Hardware" +msgstr "Құрылғылар" + +#: ../data/xfce/xfce-hardware.directory.in.h:2 +msgid "Settings for several hardware devices" +msgstr "Кейбір құрылғылар үшін баптаулар" + #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid "Audio and video players and editors" msgstr "Аудио мен видео ойнату мен түзету құралдары" @@ -89,6 +97,14 @@ msgstr "Басқа санаттарға жатпайтын қолданбала msgid "Other" msgstr "Басқалар" +#: ../data/xfce/xfce-personal.directory.in.h:1 +msgid "Personal" +msgstr "Жеке" + +#: ../data/xfce/xfce-personal.directory.in.h:2 +msgid "Personal settings" +msgstr "Жеке баптаулар" + #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid "Screensaver applets" msgstr "Экранды қорғау құралдары" @@ -113,17 +129,17 @@ msgstr "Жүйелік" msgid "System tools and utilities" msgstr "Жүйелік құралдар" -#: ../garcon/garcon-menu.c:698 +#: ../garcon/garcon-menu.c:706 #, c-format msgid "File \"%s\" not found" msgstr "\"%s\" файлы табылмады" -#: ../garcon/garcon-menu-parser.c:278 +#: ../garcon/garcon-menu-parser.c:280 #, c-format msgid "Could not load menu file data from %s: %s" msgstr "%s ішінен мәзір ақпаратын жүктеп алу мүмкін емес: %s" -#: ../garcon/garcon-menu-parser.c:284 +#: ../garcon/garcon-menu-parser.c:287 #, c-format msgid "Could not load menu file data from %s" msgstr "%s ішінен мәзір ақпаратын жүктеп алу мүмкін емес" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to d0598a6d698f98a4a11ee10689340efd5a3b54d3 (commit) from 68dcb870f549cfa25c7f433d7408d938c319ba16 (commit) commit d0598a6d698f98a4a11ee10689340efd5a3b54d3 Author: Bauzhan Muftakhidinov Date: Fri Jan 27 06:46:58 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 90 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 245 +- 1 files changed, 178 insertions(+), 67 deletions(-) diff --git a/po/kk.po b/po/kk.po index 7053467..ac3e63c 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-06 04:05+\n" +"POT-Creation-Date: 2012-01-27 01:33+\n" "PO-Revision-Date: 2011-12-17 22:34+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -17,19 +17,50 @@ msgstr "" "Language: kk\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../libxfce4ui/xfce-dialogs.c:68 +#: ../libxfce4ui/xfce-dialogs.c:80 +msgid "Failed to open web browser for online documentation" +msgstr "Желідегі онлайн құжаттамасы үшін веб браузерді ашу сәтсіз аяқталды." + +#: ../libxfce4ui/xfce-dialogs.c:195 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s құжаттамасын онлайн оқуды қалайсыз ба?" + +#: ../libxfce4ui/xfce-dialogs.c:197 +msgid "Do you want to read the manual online?" +msgstr "Желідегі онлайн құжаттаманы оқуды қалайсыз ба?" + +#: ../libxfce4ui/xfce-dialogs.c:200 +msgid "Online Documentation" +msgstr "Желідегі құжаттама" + +#: ../libxfce4ui/xfce-dialogs.c:203 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "Сіз құжаттама парақтары әзірленіп, аударылатын веб сайтына өтесіз." + +#: ../libxfce4ui/xfce-dialogs.c:207 +msgid "_Read Online" +msgstr "Же_ліден оқу" + +#: ../libxfce4ui/xfce-dialogs.c:219 +msgid "_Always go directly to the online documentation" +msgstr "Әрқ_ашан желідегі онлайн құжаттамаға өту" + +#: ../libxfce4ui/xfce-dialogs.c:263 msgid "Information" msgstr "Ақпарат" -#: ../libxfce4ui/xfce-dialogs.c:101 +#: ../libxfce4ui/xfce-dialogs.c:296 msgid "Warning" msgstr "Ескерту" -#: ../libxfce4ui/xfce-dialogs.c:135 +#: ../libxfce4ui/xfce-dialogs.c:330 msgid "Error" msgstr "Қате" -#: ../libxfce4ui/xfce-dialogs.c:186 +#: ../libxfce4ui/xfce-dialogs.c:381 msgid "Question" msgstr "Сұрақ" @@ -66,12 +97,18 @@ msgstr "Сессияны басқарушысы дұрыс клиент ID-ін #. print warning for user #: ../libxfce4ui/xfce-spawn.c:406 #, c-format -msgid "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" +"\"." msgstr "\"%s\" жұмыс бумасы жоқ болып тұр. Ол \"%s\" жасалғанда қолданылмайды." #: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" -msgstr "Жарлық терезелер басқарушысының басқа әрекетіне орнатылып тұр. Қай әрекетті қолдануды қалайсыз?" +msgid "" +"This shortcut is already being used for another window manager action. Which " +"action do you want to use?" +msgstr "" +"Жарлық терезелер басқарушысының басқа әрекетіне орнатылып тұр. Қай әрекетті " +"қолдануды қалайсыз?" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #: ../libxfce4kbd-private/xfce-shortcuts.c:56 @@ -88,8 +125,12 @@ msgstr "басқасын қалдыру" #: ../libxfce4kbd-private/xfce-shortcuts.c:55 #: ../libxfce4kbd-private/xfce-shortcuts.c:58 #, c-format -msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" -msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "" +"Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды " +"қалайсыз?" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 @@ -98,8 +139,12 @@ msgid "Keep '%s'" msgstr "'%s' қалдыру" #: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" -msgstr "Жарлық терезелер басқарушысының әрекетімен қолданылуда. Қай әрекетті қолдануды қалайсыз?" +msgid "" +"This shortcut is already being used by a window manager action. Which action " +"do you want to use?" +msgstr "" +"Жарлық терезелер басқарушысының әрекетімен қолданылуда. Қай әрекетті " +"қолдануды қалайсыз?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 msgid "Ke
[Xfce4-commits] l10n: Updated Lithuanian (lt) translation to 100%
Updating branch refs/heads/master to f8be6fd7219448d8c63b91566c3c727c06d7766b (commit) from ae73197178941104404773cd798a1b10a17ea7e7 (commit) commit f8be6fd7219448d8c63b91566c3c727c06d7766b Author: Algimantas Margevičius Date: Fri Jan 27 07:09:11 2012 +0100 l10n: Updated Lithuanian (lt) translation to 100% New status: 325 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 37 +++-- 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/po/lt.po b/po/lt.po index d62ead0..bd7f1f8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,21 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # Algimantas Margevičius , 2012. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-24 13:18+\n" +"POT-Creation-Date: 2012-01-27 05:06+\n" "PO-Revision-Date: 2012-01-24 18:05+0200\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2)\n" +"Language: \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid "Acceleration _profile:" @@ -255,7 +254,7 @@ msgstr "Versijos infomacija" #: ../dialogs/display-settings/main.c:1043 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57 +#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60 #, c-format msgid "Type '%s --help' for usage." msgstr "Bandykite „%s –help“, jei norite išsamesnės informacijos." @@ -265,7 +264,7 @@ msgstr "Bandykite „%s –help“, jei norite išsamesnės informacijos." #: ../dialogs/display-settings/main.c:1062 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70 +#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76 msgid "The Xfce development team. All rights reserved." msgstr "Xfce kūrėjų komanda. Visos teisės saugomos." @@ -274,7 +273,7 @@ msgstr "Xfce kūrėjų komanda. Visos teisės saugomos." #: ../dialogs/display-settings/main.c:1063 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71 +#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77 #, c-format msgid "Please report bugs to <%s>." msgstr "Prašome apie ydas pranešti į <%s>." @@ -1515,25 +1514,24 @@ msgstr "Darbalaukis %d" msgid "The Xfce Settings Daemon" msgstr "Xfce nustatymų demonas" -#: ../xfce4-settings-manager/main.c:41 +#: ../xfce4-settings-manager/main.c:40 msgid "Settings dialog to show" msgstr "Nustatymų dialogas kurį rodyti" -#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:184 +msgid "_All Settings" +msgstr "_Visi nustatymai" + +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:364 msgid "Settings" msgstr "Nustatymai" -#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366 msgid "Customize your desktop" msgstr "Derinti darbastalį" -#. Create back button which takes the user back to the overview -#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271 -msgid "_Overview" -msgstr "_Apžvalga" - -#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:578 -#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:594 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:850 +#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:861 #, c-format msgid "Unable to start \"%s\"" msgstr "Nepavyko paleisti „%s“" @@ -1545,3 +1543,6 @@ msgstr "Grafinė nustatymų tvarkyklė skirta Xfce 4" #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:2 msgid "Settings Manager" msgstr "Nustatymų tvarkyklė" + +#~ msgid "_Overview" +#~ msgstr "_Apžvalga" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Lithuanian (lt) translation to 100%
Updating branch refs/heads/master to ce6a714138c1a2266587ad4909d853335e2138a7 (commit) from 1e90504e107a7c1f976c37f94a3b62fbdfe6c72c (commit) commit ce6a714138c1a2266587ad4909d853335e2138a7 Author: Algimantas Margevičius Date: Fri Jan 27 07:40:58 2012 +0100 l10n: Updated Lithuanian (lt) translation to 100% New status: 283 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 165 -- 1 files changed, 96 insertions(+), 69 deletions(-) diff --git a/po/lt.po b/po/lt.po index 356a77f..cd17d63 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: xfburn 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-01-26 09:45+\n" -"PO-Revision-Date: 2012-01-26 19:11+0200\n" +"PO-Revision-Date: 2012-01-27 08:40+0200\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" "Language: lt\n" @@ -856,43 +856,45 @@ msgstr "Nuspręskite ar uždarymo mygtukas bus matomas" msgid "" "Cannot append data to multisession disc in this write mode (use TAO instead)." msgstr "" +"Šiame rašymo režime neįmanoma pridėti duomenų į multisesinį diską (naudokite " +"TAO)." #: ../xfburn/xfburn-perform-burn.c:162 msgid "Closed disc with data detected, a blank or appendable disc is needed." -msgstr "" +msgstr "Aptiktas uždarytas diskas, reikia tuščio, įrašomo disko." #: ../xfburn/xfburn-perform-burn.c:164 msgid "No disc detected in drive." -msgstr "" +msgstr "Įrenginyje nėra disko." #: ../xfburn/xfburn-perform-burn.c:167 msgid "Cannot recognize the state of the drive and disc." -msgstr "" +msgstr "Neįmanoma atpažinti įrenginio ir disko būsenos." #: ../xfburn/xfburn-perform-burn.c:180 msgid "There is not enough space available on the inserted disc." -msgstr "" +msgstr "Įdėtame diske neužtenka vietos." #: ../xfburn/xfburn-perform-burn.c:225 #, c-format msgid "Burning track %2d/%d..." -msgstr "" +msgstr "Įrašomas takelis %2d/%d..." #: ../xfburn/xfburn-perform-burn.c:229 ../xfburn/xfburn-perform-burn.c:294 msgid "Burning composition..." -msgstr "" +msgstr "Įrašomas projektas..." #: ../xfburn/xfburn-perform-burn.c:263 msgid "standby" -msgstr "" +msgstr "laukiama" #: ../xfburn/xfburn-perform-burn.c:271 msgid "ending" -msgstr "" +msgstr "baigiama" #: ../xfburn/xfburn-perform-burn.c:274 msgid "failing" -msgstr "" +msgstr "nepavyksta" #: ../xfburn/xfburn-perform-burn.c:277 msgid "unused" @@ -900,11 +902,11 @@ msgstr "nenaudojama" #: ../xfburn/xfburn-perform-burn.c:280 msgid "abandoned" -msgstr "" +msgstr "nutraukta" #: ../xfburn/xfburn-perform-burn.c:283 msgid "ended" -msgstr "" +msgstr "baigta" #: ../xfburn/xfburn-perform-burn.c:286 msgid "aborted" @@ -922,23 +924,23 @@ msgstr "nėra informacijos" #: ../xfburn/xfburn-perform-burn.c:299 msgid "Writing Lead-In..." -msgstr "" +msgstr "Įrašoma Lead-In..." #: ../xfburn/xfburn-perform-burn.c:305 msgid "Writing Lead-Out..." -msgstr "" +msgstr "Įrašoma Lead-Out..." #: ../xfburn/xfburn-perform-burn.c:311 msgid "Writing pregap..." -msgstr "" +msgstr "Įrašoma pregap..." #: ../xfburn/xfburn-perform-burn.c:317 msgid "Closing track..." -msgstr "" +msgstr "Uždaromas takelis..." #: ../xfburn/xfburn-perform-burn.c:323 msgid "Closing session..." -msgstr "" +msgstr "Sesija uždaroma..." #: ../xfburn/xfburn-perform-burn.c:329 msgid "Formatting..." @@ -946,11 +948,11 @@ msgstr "Formatuojama..." #: ../xfburn/xfburn-perform-burn.c:342 msgid "see console" -msgstr "" +msgstr "peržiūrėkite konsolę" #: ../xfburn/xfburn-perform-burn.c:370 msgid "User Aborted" -msgstr "" +msgstr "Nutraukė naudotojas" #: ../xfburn/xfburn-preferences-dialog.c:141 msgid "Preferences" @@ -958,7 +960,7 @@ msgstr "Nustatymai" #: ../xfburn/xfburn-preferences-dialog.c:142 msgid "Tune how Xfburn behaves" -msgstr "" +msgstr "Keisti Xfburn elgseną" #: ../xfburn/xfburn-preferences-dialog.c:188 #: ../xfburn/xfburn-preferences-dialog.c:192 @@ -967,7 +969,7 @@ msgstr "Laikinas aplankas" #: ../xfburn/xfburn-preferences-dialog.c:196 msgid "_Clean temporary directory on exit" -msgstr "" +msgstr "_Užveriant išvalyti laikiną aplanką" #: ../xfburn/xfburn-preferences-dialog.c:203 msgid "File browser" @@ -979,7 +981,7 @@ msgstr "Rodyti _paslėptus failus" #: ../xfburn/xfburn-preferences-dialog.c:212 msgid "Show human_readable filesizes" -msgstr "" +msgstr "Rodyti žmogui suprantamus failų _dydžius" #: ../xfburn/xfburn-preferences-dialog.c:223 msgid "General" @@ -1020,20 +1022,20 @@ msgstr "Įrašyti DVD-RAM" #: ../xfburn/xfburn-preferences-dialog.c:295 msgid "Sc_an for devices" -msgstr "" +msgstr "_Ieškoti įrenginių" #. below the device list #: ../xfburn/xfburn-preferences-dialog.c:321 msgid "Show warning on _empty speed list" -msgstr "" +msgstr "Rodyti įspėjimą jei _greičių sąrašas tuščias" #: ../xfburn/xfburn-preferenc
[Xfce4-commits] l10n: Updated Lithuanian (lt) translation to 100%
Updating branch refs/heads/master to cf1356fe736506d808bce81b982dc9bf40bbde3c (commit) from 721949e67afae2b11e3463999c221a50d1ba0c97 (commit) commit cf1356fe736506d808bce81b982dc9bf40bbde3c Author: Algimantas Margevičius Date: Fri Jan 27 08:06:50 2012 +0100 l10n: Updated Lithuanian (lt) translation to 100% New status: 273 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 36 ++-- 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/lt.po b/po/lt.po index fcb3aff..3ce76c5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: exo 0.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-15 15:09+0200\n" -"PO-Revision-Date: 2012-01-11 08:56+0200\n" +"POT-Creation-Date: 2012-01-27 01:15+\n" +"PO-Revision-Date: 2012-01-27 09:04+0200\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2)\n" @@ -35,7 +35,7 @@ msgstr "Piktograma" #: ../exo/exo-cell-renderer-icon.c:167 msgid "The icon to render." -msgstr "Piktograma atvaizduoti." +msgstr "Piktograma atvaizdavimui." #: ../exo/exo-cell-renderer-icon.c:185 msgid "GIcon" @@ -198,7 +198,7 @@ msgstr "Būsenos piktogramos" #. EXO_ICON_CHOOSER_CONTEXT_OTHER #: ../exo/exo-icon-chooser-dialog.c:131 msgid "Uncategorized Icons" -msgstr "Nekaterizuotos piktogramos" +msgstr "Nekategarizuotos piktogramos" #. EXO_ICON_CHOOSER_CONTEXT_ALL #: ../exo/exo-icon-chooser-dialog.c:135 @@ -328,7 +328,7 @@ msgstr "Parinkimo veiksena" #: ../exo/exo-icon-view.c:871 ../exo/exo-tree-view.c:154 msgid "Single Click" -msgstr "Spustelėjimas" +msgstr "Viengubas spragtelėjimas" #: ../exo/exo-icon-view.c:872 ../exo/exo-tree-view.c:155 msgid "Whether the items in the view can be activated with single clicks" @@ -408,7 +408,7 @@ msgid "" "items table to remove it." msgstr "" "Užtempkit elementą ant aukščiau esančios įrankių juostos tam, kad pridėti, o " -"kad pašalinti - nutempkit nuo įrankių juostos." +"pašalinimui - nutempkit nuo įrankių juostos." #: ../exo/exo-toolbars-editor.c:538 msgid "Separator" @@ -416,7 +416,7 @@ msgstr "Skirtukas" #: ../exo/exo-toolbars-view.c:752 msgid "Toolbar _Style" -msgstr "Įrankių juostos stilius" +msgstr "Įrankių juostos _stilius" #: ../exo/exo-toolbars-view.c:759 msgid "_Desktop Default" @@ -562,10 +562,10 @@ msgid "" "%s source package.\n" "\n" msgstr "" -"%s comes with ABSOLUTELY NO WARRANTY,\n" -"You may redistribute copies of %s under the terms of\n" -"the GNU Lesser General Public License which can be found in the\n" -"%s source package.\n" +"%s platinama BE JOKIŲ GARANTIJŲ,\n" +"Gali platinti kopijas %s pagal\n" +"GNU Lesser General Public License sąlygas, kurias galite rasti\n" +"%s pradinio kodo pakete.\n" "\n" #: ../exo-csource/main.c:312 ../exo-desktop-item-edit/main.c:201 @@ -587,7 +587,7 @@ msgstr "Visi failai" #: ../exo-desktop-item-edit/exo-die-command-entry.c:269 #: ../exo-helper/exo-helper-chooser.c:403 msgid "Executable Files" -msgstr "Vykdomi failai" +msgstr "Vykdomieji failai" #: ../exo-desktop-item-edit/exo-die-command-entry.c:284 #: ../exo-helper/exo-helper-chooser.c:418 @@ -693,7 +693,7 @@ msgstr "Pasirinkite piktogramą" #. allocate the file chooser dialog #: ../exo-desktop-item-edit/exo-die-editor.c:637 msgid "Select a working directory" -msgstr "Nustatyti darbinį aplanką" +msgstr "Pasirinkite darbinį aplanką" #: ../exo-desktop-item-edit/exo-die-utils.c:168 msgid "File location is not a regular file or directory" @@ -790,7 +790,7 @@ msgstr "Nepavyko apdoroti „%s“ turinio: %s" #: ../exo-desktop-item-edit/main.c:304 #, c-format msgid "File \"%s\" has no type key" -msgstr "Failas „%s“ neturi rašymo klavišo" +msgstr "Failas „%s“ neturi tipo įrašo" #. tell the user that we don't support the type #: ../exo-desktop-item-edit/main.c:314 @@ -900,11 +900,11 @@ msgstr "Paspauskite kairį pelės mygtuką norėdami pakeisti pasirinktą progra #: ../exo-helper/exo-helper-chooser.c:155 msgid "Application Chooser Button" -msgstr "Programos parinkimo mygtukas" +msgstr "Programos pasirinkimo mygtukas" #: ../exo-helper/exo-helper-chooser.c:299 msgid "No application selected" -msgstr "Programa nepasirinkta" +msgstr "Nepasirinkta jokio programa" #: ../exo-helper/exo-helper-chooser.c:315 msgid "Failed to set default Web Browser" @@ -1102,7 +1102,7 @@ msgstr "" #: ../exo-helper/main.c:104 #, c-format msgid "Type '%s --help' for usage." -msgstr "Bandykite '%s --help' dėl naudojimo." +msgstr "Bandykite „%s --help“ dėl naudojimo." #: ../exo-helper/main.c:154 #, c-format __
[Xfce4-commits] l10n: Updated Lithuanian (lt) translation to 100%
Updating branch refs/heads/master to 682a51dedf38602077923a27148e799ade9b924e (commit) from d0598a6d698f98a4a11ee10689340efd5a3b54d3 (commit) commit 682a51dedf38602077923a27148e799ade9b924e Author: Algimantas Margevičius Date: Fri Jan 27 08:15:03 2012 +0100 l10n: Updated Lithuanian (lt) translation to 100% New status: 90 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 26 ++ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index ee26f21..f2ae63e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,20 +8,20 @@ msgid "" msgstr "" "Project-Id-Version: libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-09 08:48+\n" -"PO-Revision-Date: 2012-01-09 14:55+0200\n" +"POT-Creation-Date: 2012-01-27 01:33+\n" +"PO-Revision-Date: 2012-01-27 09:14+0200\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2)\n" #: ../libxfce4ui/xfce-dialogs.c:80 msgid "Failed to open web browser for online documentation" -msgstr "Nepavyko atverti naršyklės dokumentacijai" +msgstr "Nepavyko atverti naršyklės tinklo dokumentacijai" #: ../libxfce4ui/xfce-dialogs.c:195 #, c-format @@ -165,7 +165,7 @@ msgstr "Šis trumpinys jau naudojamas kažkam kitam." #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 msgid "Window Manager Action Shortcut" -msgstr "Langų tvarkyklės veiksmų trumpinys" +msgstr "Langų tvarkyklės veiksmų susiejimas" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215 @@ -174,7 +174,7 @@ msgstr "Veiksmas:" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Command Shortcut" -msgstr "Komandos trumpinys" +msgstr "Komandos susiejimas" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:210 msgid "Command:" @@ -182,11 +182,11 @@ msgstr "Komanda:" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 msgid "Shortcut" -msgstr "Trumpinys" +msgstr "Susiejimas" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:255 msgid "Shortcut:" -msgstr "Trumpinys:" +msgstr "Susiejimas:" #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:300 msgid "Could not grab the keyboard." @@ -249,7 +249,7 @@ msgid "" "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " "and fast." msgstr "" -"Moderni failų tvarkyklė skirta Unix/Linux darbastaliams, bandanti būti " +"Moderni failų tvarkyklė skirta Unix/Linux darbastaliams, besistengianti būti " "lengvai naudojama ir greita." #: ../xfce4-about/main.c:89 @@ -284,7 +284,7 @@ msgid "" "Shows the applications installed on your system in categories, so you can " "quickly find and launch them." msgstr "" -"Parodo įdiegtas programas kategorijomis, todėl galite lengvai rasti ir " +"Parodo įdiegtas programas kategorijose, todėl galite lengvai rasti ir " "paleisti reikalingą programą." #: ../xfce4-about/main.c:104 @@ -350,7 +350,9 @@ msgstr "" msgid "" "Xfce 4 is copyright Olivier Fourdan (four...@xfce.org). The different " "components are copyrighted by their respective authors." -msgstr "Xfce 4 autorinės teisės priklauso Olivier Fourdan (four...@xfce.org)." +msgstr "" +"Xfce 4 autorinės teisės priklauso Olivier Fourdan (four...@xfce.org). Kiti " +"komponentai priklauso atitinkamiems autoriams." #: ../xfce4-about/main.c:288 msgid "" @@ -359,7 +361,7 @@ msgid "" "published by the Free Software Foundation; either version 2 of the License, " "or (at your option) any later version." msgstr "" -"Libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs ir exo paketai ra " +"Libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs ir exo paketai yra " "platinami pagal GNU General Public License kaip paskelbė Free Software " "Foundation; arba pagal licencijos versiją 2, ar (jūsų pasirinkimas) bet " "kurią vėlesnę versiją." ___ 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 ed440fab63a02cea13537dc60f088ecf134b90a8 (commit) from f8be6fd7219448d8c63b91566c3c727c06d7766b (commit) commit ed440fab63a02cea13537dc60f088ecf134b90a8 Author: Chipong Luo Date: Fri Jan 27 08:36:21 2012 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 325 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 64 -- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 570bc3b..5708437 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-23 08:18+\n" +"POT-Creation-Date: 2012-01-27 05:06+\n" "PO-Revision-Date: 2010-11-27 21:48+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" @@ -237,7 +237,7 @@ msgstr "版本信息" #: ../dialogs/display-settings/main.c:1043 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57 +#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60 #, c-format msgid "Type '%s --help' for usage." msgstr "输入 ‘%s --help’ 获取用法。" @@ -247,7 +247,7 @@ msgstr "输入 ‘%s --help’ 获取用法。" #: ../dialogs/display-settings/main.c:1062 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70 +#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 开发团队。保留所有权利。" @@ -256,7 +256,7 @@ msgstr "Xfce 开发团队。保留所有权利。" #: ../dialogs/display-settings/main.c:1063 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71 +#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77 #, c-format msgid "Please report bugs to <%s>." msgstr "请向 <%s> 报告缺陷。" @@ -899,8 +899,7 @@ msgstr "选择自定义命令(_U)：" msgid "" "Use a custom command for an application that is not available from the above " "application list." -msgstr "" -"为以上应用程序列表中没有的应用程序使用自定义命令。" +msgstr "为以上应用程序列表中没有的应用程序使用自定义命令。" #: ../dialogs/mime-settings/xfce-mime-chooser.c:223 msgid "_Browse..." @@ -925,8 +924,7 @@ msgstr "其它应用程序" #: ../dialogs/mime-settings/xfce-mime-chooser.c:611 #, c-format msgid "Open %s and other files of type \"%s\" with:" -msgstr "" -"用此打开 %s 和其它类型 “%s” 的文件：" +msgstr "用此打开 %s 和其它类型 “%s” 的文件：" #: ../dialogs/mime-settings/xfce-mime-chooser.c:647 #, c-format @@ -964,13 +962,13 @@ msgid "Default Application" msgstr "默认应用程序" #: ../dialogs/mime-settings/xfce-mime-window.c:479 -#: ../dialogs/mime-settings/xfce-mime-window.c:602 +#: ../dialogs/mime-settings/xfce-mime-window.c:604 msgid "User Set" msgstr "用户设置" #. sort the names but keep Default on top #: ../dialogs/mime-settings/xfce-mime-window.c:481 -#: ../dialogs/mime-settings/xfce-mime-window.c:602 +#: ../dialogs/mime-settings/xfce-mime-window.c:604 #: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374 #: ../dialogs/mouse-settings/main.c:434 msgid "Default" @@ -983,35 +981,33 @@ msgid_plural "%d MIME types found" msgstr[0] "找到了 %d 个 MIME 类型" msgstr[1] "找到了 %d 个 MIME 类型" -#: ../dialogs/mime-settings/xfce-mime-window.c:647 +#: ../dialogs/mime-settings/xfce-mime-window.c:649 #, c-format msgid "Failed to set application \"%s\" for mime type \"%s\"." -msgstr "" -"无法为 mime 类型 “%2$s” 设置应用程序 “%1$s”。" +msgstr "无法为 mime 类型 “%2$s” 设置应用程序 “%1$s”。" -#: ../dialogs/mime-settings/xfce-mime-window.c:904 +#: ../dialogs/mime-settings/xfce-mime-window.c:906 #, c-format msgid "" "Are you sure you want to reset content type \"%s\" to its default value?" msgstr "您确定要重置内容类型 “%s” 为其默认值吗？" -#: ../dialogs/mime-settings/xfce-mime-window.c:908 +#: ../dialogs/mime-settings/xfce-mime-window.c:910 msgid "Question" msgstr "问题" -#: ../dialogs/mime-settings/xfce-mime-window.c:911 +#: ../dialogs/mime-settings/xfce-mime-window.c:913 msgid "" "This will remove your custom mime-association and restore the system-wide " "default." -msgstr "" -"此会移除您的自定义 mime 绑定并恢复系统范围的默认值。" +msgstr "此会移除您的自定义 mime 绑定并恢复系统范围的默认值。" -#: ../dialogs/mime-settings/xfce-mime-window.c:915 -#: ../dialogs/mime-settings/xfce-mime-window.c:986 +#: ../dialogs/mime-settings/xfce-mime-window.c:917 +#: ../dialogs/mime-settings/xfce-mime-window.c:988 msgid "Reset to Default" msgstr "重置为默认" -#: ../dialogs/mime-settings/xfce-mime-window.c:981 +#: ../dialogs/mime-settings/xfce-mime-window.
