[Xfce4-commits] xfce4-panel:andrzejr/deskbar2 panel-itembar: Removed item size checks.
Updating branch refs/heads/andrzejr/deskbar2
to f36269287e32cab3239a07f44b9be00ba8bd11f1 (commit)
from 5dce65fb615c76d73ec3f8a4da882852efb7645c (commit)
commit f36269287e32cab3239a07f44b9be00ba8bd11f1
Author: Andrzej ndrwr...@gmail.com
Date: Wed Jan 25 14:35:21 2012 +0900
panel-itembar: Removed item size checks.
Problem:
get_requisition on external plugins returns an old size_request
value when the size of the panel is changed quickly (e.g. when
user controls the size slider using cursor keys).
In case of small external plugins this means that they are
losing their small status when the user quickly decreases
the panel size. This is because their get_requisition size
is temporarily larger than the row size. This in turn causes
a lot of flicker when the user changes (decreases) the panel size.
(the above was tested using an xfce4-mixer plugin with a patch from:
https://bugzilla.xfce.org/show_bug.cgi?id=8350 )
Arguably, the itembar doesn't have to check the plugin size, only
the small flag. It's then the plugins responsibility to render itself
in such a way it fits in a single row.
The itembar is still using the plugin size to decide the row height.
It may temporarily be incorrect when the panel size changes quickly
but that doesn't cause flicker.
panel/panel-itembar.c |9 +++--
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 2f3564c..bda6c01 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -339,8 +339,7 @@ panel_itembar_size_request (GtkWidget *widget,
/* check if the small child fits in a row */
if (child-option == CHILD_OPTION_SMALL
- itembar-nrows 1
- CHILD_FITS_IN_ROW (child_req, itembar))
+ itembar-nrows 1)
{
child_len = CHILD_LENGTH (child_req, itembar);
@@ -453,8 +452,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
child_len = CHILD_LENGTH (child_req, itembar);
if (G_UNLIKELY (child-option == CHILD_OPTION_SMALL
- itembar-nrows 1
- CHILD_FITS_IN_ROW (child_req, itembar)))
+ itembar-nrows 1))
{
/* extract from the available space */
if (child_len row_max_size)
@@ -586,8 +584,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
child_len = 1;
if (child-option == CHILD_OPTION_SMALL
- itembar-nrows 1
- CHILD_FITS_IN_ROW (child_req, itembar))
+ itembar-nrows 1)
{
if (row_max_size child_len)
row_max_size = child_len;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to eba5c3387ae5547ef0fe0426c514fbf7b8c9a332 (commit) from d07c77c08a44a03238380e2618fe06890df3379c (commit) commit eba5c3387ae5547ef0fe0426c514fbf7b8c9a332 Author: Pjotr Anon pliniusmi...@gmail.com Date: Wed Jan 25 12:52:26 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 22 +++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index ba74fd9..332f9e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: garcon\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-07 16:06+\n +POT-Creation-Date: 2012-01-25 03:00+\n PO-Revision-Date: 2011-09-07 16:15+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -58,6 +58,14 @@ msgstr Afbeeldingen msgid Graphics creation and manipulation applications msgstr Toepassingen voor het maken en bewerken van afbeeldingen +#: ../data/xfce/xfce-hardware.directory.in.h:1 +msgid Hardware +msgstr Apparatuur + +#: ../data/xfce/xfce-hardware.directory.in.h:2 +msgid Settings for several hardware devices +msgstr Instellingen voor verschillende apparaten + #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid Audio and video players and editors msgstr Geluid- en videospelers en -bewerkers @@ -90,6 +98,14 @@ msgstr Toepassingen die niet in andere categorieën passen msgid Other msgstr Overige +#: ../data/xfce/xfce-personal.directory.in.h:1 +msgid Personal +msgstr Persoonlijk + +#: ../data/xfce/xfce-personal.directory.in.h:2 +msgid Personal settings +msgstr Persoonlijke instellingen + #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid Screensaver applets msgstr Schermbeveiligingtoepassingen @@ -119,12 +135,12 @@ msgstr Systeemgereedschap en hulpmiddelen msgid File \%s\ not found msgstr Bestand \%s\ niet gevonden -#: ../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 Kon gegevens van menubestand niet laden vanuit %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 Kon gegevens van menubestand niet laden vanuit %s ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:nick/settings-manager Separate category contents and titles using a horizontal line.
Updating branch refs/heads/nick/settings-manager
to 943380aad687945984b50ff8ae3c4ec7c8cd73e0 (commit)
from b99b994e659f83b853ad9e5cf29e87ea01635c00 (commit)
commit 943380aad687945984b50ff8ae3c4ec7c8cd73e0
Author: Jannis Pohlmann jannis.pohlm...@codethink.co.uk
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] www:master l10n: Updated Spanish (Castilian) (es) translation to 89%
Updating branch refs/heads/master to 06e94410fff88e5e69c8a9b46bb9087c88667b8b (commit) from 5c19bdda49280d628bf52692bfdd4aa4cf3ddda6 (commit) commit 06e94410fff88e5e69c8a9b46bb9087c88667b8b Author: Daniel Durante danieldura...@ymail.com Date: Wed Jan 25 17:16:42 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 89% New status: 599 messages complete with 74 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po | 256 +++--- 1 files changed, 173 insertions(+), 83 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index eb8f23a..b4420e5 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -2,13 +2,13 @@ # 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 afsanche...@gmail.com, 2011. -# +# msgid msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n; POT-Creation-Date: 2011-09-26 18:33+0200\n -PO-Revision-Date: 2012-01-24 01:00+0100\n +PO-Revision-Date: 2012-01-25 17:15+0100\n Last-Translator: Daniel Durante danieldura...@ymail.com\n Language-Team: Spanish\n MIME-Version: 1.0\n @@ -29,27 +29,38 @@ 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 @@ -101,41 +112,52 @@ 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 @@ -175,7 +197,9 @@ msgstr bXfce 4.6/bProporciona 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 @@ -192,7 +216,8 @@ msgstr Nuevo reloj binario msgid The bclock plugin/b 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 bnotification area plugin/b allows you to hide selected notification icons to keep your notification area clean and readable. msgstr El bplug-in del reloj/b 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 bnueva área del plug-in de notificación/b le permite ocultar los iconos de notificación seleccionados para mantener el área de notificación limpia y legible. -#:
[Xfce4-commits] garcon:master l10n: Updated Lithuanian (lt) translation to 100%
Updating branch refs/heads/master to f0d84d1f9c3afee2283753b276d608cf007e36fe (commit) from eba5c3387ae5547ef0fe0426c514fbf7b8c9a332 (commit) commit f0d84d1f9c3afee2283753b276d608cf007e36fe Author: Algimantas Margevičius gy...@mail.ru Date: Wed Jan 25 17:46:24 2012 +0100 l10n: Updated Lithuanian (lt) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 25 - 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index ea7ca0d..932d3f3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,21 +3,20 @@ # This file is distributed under the same license as the garcon package. # Ričardas Vasiulis ricarda...@inbox.lt, 2010. # Algimantas Margevičius margevicius.algiman...@gmail.com, 2012. -# +# msgid msgstr Project-Id-Version: garcon\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-15 15:20+0200\n +POT-Creation-Date: 2012-01-25 14:36+\n PO-Revision-Date: 2012-01-09 12:44+0200\n Last-Translator: Algimantas Margevičius margevicius.algiman...@gmail.com\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 -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n -%10010 || n%100=20) ? 1 : 2)\n +Language: lt\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n%10010 || n%100=20) ? 1 : 2)\n #: ../data/xfce/xfce-accessories.directory.in.h:1 msgid Accessories @@ -59,6 +58,14 @@ msgstr Grafika msgid Graphics creation and manipulation applications msgstr Grafikos kūrimo ir tvarkymo programos +#: ../data/xfce/xfce-hardware.directory.in.h:1 +msgid Hardware +msgstr Aparatinė įranga + +#: ../data/xfce/xfce-hardware.directory.in.h:2 +msgid Settings for several hardware devices +msgstr Nustatymai keliems įrenginiams + #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid Audio and video players and editors msgstr Garso ir vaizdo grotuvai bei redaktoriai @@ -91,6 +98,14 @@ msgstr Programos, kurios nepatenka į kitas kategorijas msgid Other msgstr Kita +#: ../data/xfce/xfce-personal.directory.in.h:1 +msgid Personal +msgstr Asmeniniai + +#: ../data/xfce/xfce-personal.directory.in.h:2 +msgid Personal settings +msgstr Asmeniniai nustatymai + #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid Screensaver applets msgstr Ekrano užsklandos įskiepiai ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master l10n: first commit
Updating branch refs/heads/master
to d87d06d6b77065ea13b957b8d35ae0dd52ead1ef (commit)
from 124b208edcafb85c816aff4dd35a63876822deab (commit)
commit d87d06d6b77065ea13b957b8d35ae0dd52ead1ef
Author: Kevin Brubeck Unhammer p.ixiemot...@gmail.com
Date: Wed Jan 25 20:38:09 2012 +0100
l10n: first commit
New status: 73 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{nb.po = nn.po} | 166 ++-
1 files changed, 71 insertions(+), 95 deletions(-)
diff --git a/po/nb.po b/po/nn.po
similarity index 68%
copy from po/nb.po
copy to po/nn.po
index c274084..77dc1a4 100644
--- a/po/nb.po
+++ b/po/nn.po
@@ -1,16 +1,14 @@
-# Norwegian Bokmal translations for xfce4-screenshooter-plugin package.
+# Norwegian Nynorsk translations for xfce4-screenshooter-plugin package.
# Copyright (C) 2007 THE xfce4-screenshooter-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the
xfce4-screenshooter-plugin package.
-# Terje Uriansrud te...@uriansrud.net, 2010.
-#
msgid
msgstr
Project-Id-Version: xfce4-screenshooter-plugin 1.0.2\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2011-07-31 23:29+0200\n
-PO-Revision-Date: 2007-07-02 00:22+0200\n
-Last-Translator: Terje Uriansrud te...@uriansrud.net\n
-Language-Team: Norwegian Bokmal\n
+PO-Revision-Date: 2012-01-25 20:37+0100\n
+Last-Translator: Kevin Brubeck Unhammer unham...@fsfe.org\n
+Language-Team: Norwegian Nynorsk\n
Language: \n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
@@ -30,9 +28,7 @@ msgstr Overfør
msgid
span weight=\bold\ stretch=\semiexpanded\The screenshot is being
transferred to:/span
-msgstr
-span weight=\bold\ stretch=\semiexpanded\Skjermbilde overføres til:/
-span
+msgstr span weight=\bold\ stretch=\semiexpanded\Skjermbiletet vert
overført til:/span
#: ../lib/screenshooter-dialogs.c:672 ../lib/screenshooter-dialogs.c:689
#: ../lib/screenshooter-dialogs.c:881 ../lib/screenshooter-utils.c:64
@@ -40,43 +36,41 @@ msgstr
#: ../src/xfce4-screenshooter.desktop.in.in.h:1
#: ../panel-plugin/screenshooter.desktop.in.in.h:1
msgid Screenshot
-msgstr Skjermbilde
+msgstr Skjermbilete
#: ../lib/screenshooter-dialogs.c:684
msgid Take a screenshot
-msgstr Ta et skjermbilde
+msgstr Ta eit skjermbilete
#: ../lib/screenshooter-dialogs.c:699
msgid Preferences
-msgstr Innstillinger
+msgstr Innstillingar
#: ../lib/screenshooter-dialogs.c:730
msgid span weight=\bold\ stretch=\semiexpanded\Region to capture/span
-msgstr
-span weight=\bold\ stretch=\semiexpanded\Område som skal tas bilde av/
-span
+msgstr span weight=\bold\ stretch=\semiexpanded\Område å ta bilete
av/span
#: ../lib/screenshooter-dialogs.c:750
msgid Entire screen
-msgstr Hele skjermen
+msgstr Heile skjermen
#: ../lib/screenshooter-dialogs.c:757 ../src/main.c:53
#: ../panel-plugin/screenshooter-plugin.c:311
msgid Take a screenshot of the entire screen
-msgstr Ta skjermbildekopi av hele skjermen
+msgstr Ta skjermbilete av heile skjermen
#: ../lib/screenshooter-dialogs.c:765
msgid Active window
-msgstr Aktivt vindu
+msgstr Aktivt vindauge
#: ../lib/screenshooter-dialogs.c:772 ../src/main.c:90
#: ../panel-plugin/screenshooter-plugin.c:316
msgid Take a screenshot of the active window
-msgstr Ta en skjermbildekopi av det aktive vinduet
+msgstr Ta skjermbilete av det aktive vindauget
#: ../lib/screenshooter-dialogs.c:780
msgid Select a region
-msgstr Velg et område
+msgstr Vel eit område
#: ../lib/screenshooter-dialogs.c:785 ../src/main.c:68
#: ../panel-plugin/screenshooter-plugin.c:321
@@ -84,147 +78,135 @@ msgid
Select a region to be captured by clicking a point of the screen without
releasing the mouse button, dragging your mouse to the other corner of the
region, and releasing the mouse button.
-msgstr
-Velg området som skal tas bilde av ved å klikke uten å slippe museknappen,
-deretter flytt musepekeren til det andre hjørnet av området, og slipp
-knappen.
+msgstr Vel område å ta bilete av ved å klikka utan å sleppa museknappen,
flytt så musepeikaren til det andre hjørnet av området, og slepp knappen.
#: ../lib/screenshooter-dialogs.c:795
msgid Capture the mouse pointer
-msgstr Fang musepeker
+msgstr Fang musepeikaren
#: ../lib/screenshooter-dialogs.c:800
msgid Display the mouse pointer on the screenshot
-msgstr Vis musepekeren på skjermkopien
+msgstr Vis musepeikaren på skjermbiletet
#: ../lib/screenshooter-dialogs.c:816
msgid
span weight=\bold\ stretch=\semiexpanded\Delay before capturing/span
-msgstr
-span weight=\bold\ stretch=\semiexpanded\Forsinkelse før bilde fanges/
-span
+msgstr span weight=\bold\ stretch=\semiexpanded\Forseinking før biletet
vert fanga/span
#: ../lib/screenshooter-dialogs.c:838
msgid Delay in seconds before the screenshot is taken
-msgstr Forsinkelse i sekunder før skjermbildekopien tas
+msgstr Forseinking i sekund før
[Xfce4-commits] xfce4-settings:nick/settings-manager Add non-functional search entry.
Updating branch refs/heads/nick/settings-manager
to 2a5c55e58c27417332c7653c71ad390826c90b9d (commit)
from 943380aad687945984b50ff8ae3c4ec7c8cd73e0 (commit)
commit 2a5c55e58c27417332c7653c71ad390826c90b9d
Author: Nick Schermer n...@xfce.org
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);
+
[Xfce4-commits] xfce4-settings:nick/settings-manager Restore the --dialog option.
Updating branch refs/heads/nick/settings-manager
to 75481a5d3092b6b8a8caa84a0eb57759192294e8 (commit)
from 2a5c55e58c27417332c7653c71ad390826c90b9d (commit)
commit 75481a5d3092b6b8a8caa84a0eb57759192294e8
Author: Nick Schermer n...@xfce.org
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),
[Xfce4-commits] xfce4-settings:nick/settings-manager Cleanup main.
Updating branch refs/heads/nick/settings-manager
to 7e92b148ae8a31d9d1c90a2e8bacb588d0d949d7 (commit)
from 75481a5d3092b6b8a8caa84a0eb57759192294e8 (commit)
commit 7e92b148ae8a31d9d1c90a2e8bacb588d0d949d7
Author: Nick Schermer n...@xfce.org
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 gtk/gtk.h
-#include xfconf/xfconf.h
#include libxfce4util/libxfce4util.h
#include garcon/garcon.h
@@ -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] xfce4-settings:nick/settings-manager Simulate scrolling when item is selected.
Updating branch refs/heads/nick/settings-manager
to 1f8b5e28992a09e24ec22f78577209fe4d82fac1 (commit)
from 7e92b148ae8a31d9d1c90a2e8bacb588d0d949d7 (commit)
commit 1f8b5e28992a09e24ec22f78577209fe4d82fac1
Author: Nick Schermer n...@xfce.org
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 = GTK_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] ristretto:master Round rendering of image to whole pixels (Bug #8317)
Updating branch refs/heads/master to 98d7583237987d53ccb99f6e798f5c2602bdfba5 (commit) from e3c3ad95b1c5e9fc845ad21d16a52546b944aef4 (commit) commit 98d7583237987d53ccb99f6e798f5c2602bdfba5 Author: Stephan Arts step...@xfce.org 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] ristretto:master Fix --slideshow and --fullscreen cli options
Updating branch refs/heads/master
to ea5dffbaa4131a5390279dc3f719a692bf360663 (commit)
from 98d7583237987d53ccb99f6e798f5c2602bdfba5 (commit)
commit ea5dffbaa4131a5390279dc3f719a692bf360663
Author: Stephan Arts step...@xfce.org
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 43906de..1f521bd 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();
@@ -267,6 +273,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 baf6f7d..fc110e1 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);
}
/**
@@ -3504,3 +3466,55 @@ cb_rstto_desktop_type_changed (
rstto_main_window_update_buttons (window);
}
+
+gboolean
+rstto_main_window_play_slideshow
