[Goodies-commits] r3654 - in ristretto/trunk: . po src
Stephan Arts
stephan at xfce.org
Sat Dec 1 00:14:24 CET 2007
Author: stephan
Date: 2007-11-30 23:14:24 +0000 (Fri, 30 Nov 2007)
New Revision: 3654
Modified:
ristretto/trunk/ChangeLog
ristretto/trunk/po/ChangeLog
ristretto/trunk/po/cs.po
ristretto/trunk/po/de.po
ristretto/trunk/po/fi.po
ristretto/trunk/po/fr.po
ristretto/trunk/po/hu.po
ristretto/trunk/po/lv.po
ristretto/trunk/po/nb_NO.po
ristretto/trunk/po/nl.po
ristretto/trunk/po/pt_BR.po
ristretto/trunk/po/ur.po
ristretto/trunk/src/main.c
ristretto/trunk/src/main_window.c
ristretto/trunk/src/picture_viewer.c
ristretto/trunk/src/thumbnail_viewer.c
Log:
Modify behaviour when opening files from CLI
Fix bg-color stuff
Improve the preferences dialog.
Update dutch translation. (and the other .po files)
Modified: ristretto/trunk/ChangeLog
===================================================================
--- ristretto/trunk/ChangeLog 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/ChangeLog 2007-11-30 23:14:24 UTC (rev 3654)
@@ -1,8 +1,12 @@
xxxx-xx-xx:
* src/main_window.c:
- Add keyboard-shortcuts for rotating
+ - Fix modification of bg-color using preferences dialog
* src/navigator.c:
- Fix thumbnail-scaling when thumbnail is first generated (Bug #3693)
+ - Refresh when new images are added and within visible range
+ * src/main.c:
+ - Improve behaviour when opening images from cli.
2007-11-25: Release 0.0.13
* src/main.c:
Modified: ristretto/trunk/po/ChangeLog
===================================================================
--- ristretto/trunk/po/ChangeLog 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/ChangeLog 2007-11-30 23:14:24 UTC (rev 3654)
@@ -1,3 +1,6 @@
+2007-11-30 Stephan Arts <stephan at xfce.org>
+ * nl.po: Update Dutch translation
+
2007-11-29 Og Maciel <ogmaciel at gnome.org>
* pt_BR.po: Updated Brazilian Portuguese translation by
Fábio Nogueira <deb-user-ba at ubuntu.com>
Modified: ristretto/trunk/po/cs.po
===================================================================
--- ristretto/trunk/po/cs.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/cs.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
# Miro Hrončok <churchyard at gmail.com>, 2007.
#
+#: ../src/main.c:66
msgid ""
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 10:10+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-11-28 23:12+0100\n"
"Last-Translator: Miro Hrončok <churchyard at gmail.com>\n"
"Language-Team: Czech\n"
@@ -29,101 +30,111 @@
"Napište %s --help pro seznam všech možných parametrů.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Soubor"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "O_tevřít složku"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Naposledy otevřené"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Upravit"
-#: ../src/main_window.c:355
-#: ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "Otevřít pomocí..."
-#: ../src/main_window.c:363
-#: ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Nejsou k dispozici žádné programy"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Zobrazit"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr "Zo_brazit nástrojovou lištu"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
msgid "Thumbnail _Viewer"
msgstr "_Náhledy"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr "_Zoom"
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr "_Rotace"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
msgid "Show _Horizontally"
msgstr "_Horizontálně"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
msgid "Show _Vertically"
msgstr "_Vertikálně"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
msgid "H_ide"
msgstr "_Nezobrazovat"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "Otočit do_prava"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "Otočit do_leva"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Přejít"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Nápověda"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr "Volby prohlížeče obrázků"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr "Promítání snímků"
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr "Prodleva"
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr "Načítat dopředu"
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
@@ -131,7 +142,7 @@
"Čas po který je zobrazen jeden snímek při promítání\n"
"(ve vteřinách)"
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
@@ -139,36 +150,41 @@
"Načítat snímky do paměti ještě předtím, než mají být zobrazeny\n"
"(použije se více paměti)"
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr "Načítat _předem"
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Vývojář:"
-#: ../src/main_window.c:1213
-msgid "Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment."
-msgstr "Ristretto je rychlý a odlehčený prohlížeč obrázků pro desktopové prostředí Xfce."
+#: ../src/main_window.c:1290
+msgid ""
+"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
+"environment."
+msgstr ""
+"Ristretto je rychlý a odlehčený prohlížeč obrázků pro desktopové prostředí "
+"Xfce."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Miro Hrončok <churchyard at gmail.com>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Načíst obrázek"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Nemohu otevřít soubor"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Otevřít složku"
-#: ../src/main_window.c:1390
-msgid "Are you sure you want to clear ristretto's list of recently opened documents?"
+#: ../src/main_window.c:1467
+msgid ""
+"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr "Opravdu chcete vyprázdnit seznam naposledy otevřených dokumentů?"
#: ../ristretto.desktop.in.h:1
@@ -185,8 +201,10 @@
#~ msgid "Behaviour"
#~ msgstr "Chování"
+
#~ msgid "Flip _Vertically"
#~ msgstr "Překlopit vertikálně"
+
#~ msgid "Flip _Horizontally"
#~ msgstr "Překlopit horizontálně"
Modified: ristretto/trunk/po/de.po
===================================================================
--- ristretto/trunk/po/de.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/de.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-07-03 00:59:21+0200\n"
"Last-Translator: stephan arts <stephan at xfce.org>\n"
"Language-Team: German\n"
@@ -28,126 +28,138 @@
msgstr ""
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Datei"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "_Ordner öffnen"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Zuletzt geöffnet"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "Ö_fnen mit..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Keine Programme verfügbar"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Ansicht"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
#, fuzzy
msgid "Show _Toolbar"
msgstr "_Werkzeugleiste anzeigen"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "Vor_schaubilder"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
#, fuzzy
msgid "_Rotate"
msgstr "_Links drehen"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "_Horizontal anzeigen"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "_Vertikal anzeigen"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "Ver_bergen"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "_Rechts drehen"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "_Links drehen"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Gehe zu"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Hilfe"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
#, fuzzy
msgid "Image viewer Preferences"
msgstr "Bildbetrachter"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr ""
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr ""
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr ""
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
msgstr ""
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
msgstr ""
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr ""
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Entwickler:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
@@ -155,23 +167,23 @@
"Ristretto ist ein schneller und leichter Bildbetrachter für die "
"Arbeitsumgebung Xfce."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Christian Dywan <christian at twotoasts.de>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Bild öffnen"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Datei konnte nicht geöffnet werden"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "_Ordner öffnen"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/fi.po
===================================================================
--- ristretto/trunk/po/fi.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/fi.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto 0.0.5\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-09-14 11:19+0300\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish <xfce-i18n at xfce.org>\n"
@@ -28,148 +28,160 @@
msgstr ""
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Tiedosto"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "Avaa _hakemisto"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Viimeaikaiset"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Muokkaa"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "_Avaa sovelluksessa..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Sovelluksia ei saatavilla"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Näytä"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
#, fuzzy
msgid "Show _Toolbar"
msgstr "Näytä työkalupalkki"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "Pienoiskuvat"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
#, fuzzy
msgid "_Rotate"
msgstr "Käännä _vasempaan"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "Näytä vaakasuunnassa"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "Näytä pystysuunnassa"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "Piilota"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "Käännä _oikeaan"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "Käännä _vasempaan"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Siirry"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Ohje"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
#, fuzzy
msgid "Image viewer Preferences"
msgstr "Kuvankatseluohjelma"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr ""
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr ""
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr ""
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
msgstr ""
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
msgstr ""
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr ""
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Kehittäjä:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr "Ristretto on nopea ja kevyt kuvankatseluohjelma Xfce-työpöydälle."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Avaa kuva"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Tiedoston avaus ei onnistunut"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Avaa hakemisto"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/fr.po
===================================================================
--- ristretto/trunk/po/fr.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/fr.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
# Mike Massonnet <mmassonnet at xfce.org>, 2007.
#
+#: ../src/main.c:66
msgid ""
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-11-25 12:05+0100\n"
"Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
"Language-Team: French\n"
@@ -27,104 +28,115 @@
"Try %s --help to see a full list of available command line options.\n"
msgstr ""
"%s: %s\n"
-"Essayez %s --help pour voir une liste complète des options en ligne de commande.\n"
+"Essayez %s --help pour voir une liste complète des options en ligne de "
+"commande.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Fichier"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "O_uvrir un répertoire"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Récemment ouvert"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Editer"
-#: ../src/main_window.c:355
-#: ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "_Ouvrir avec..."
-#: ../src/main_window.c:363
-#: ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Aucune application disponible"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Afficher"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr "Barre d’_outils"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
msgid "Thumbnail _Viewer"
msgstr "Vue des _miniatures"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr "_Zoom"
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr "_Rotation"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
msgid "Show _Horizontally"
msgstr "Afficher _horizontalement"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
msgid "Show _Vertically"
msgstr "Afficher _verticalement"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
msgid "H_ide"
msgstr "_Cacher"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "Tourner vers la _droite"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "Tourner vers la _gauche"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "A_ller"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "A_ide"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr "Préférences du visualiseur d’images"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr "Diaporama"
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr "Durée"
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr "Préchargement"
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
@@ -132,7 +144,7 @@
"La durée d’affichage d’une image individuelle durant le diaporama\n"
"(en secondes)"
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
@@ -140,37 +152,44 @@
"Précharger les images durant le diaporama\n"
"(nécessite plus de mémoire vive)"
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr "_Précharger les images"
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Développeur :"
-#: ../src/main_window.c:1213
-msgid "Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment."
-msgstr "Ristretto est un visualiseur d’images léger et rapide pour l’environnement de bureau Xfce."
+#: ../src/main_window.c:1290
+msgid ""
+"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
+"environment."
+msgstr ""
+"Ristretto est un visualiseur d’images léger et rapide pour l’environnement "
+"de bureau Xfce."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Mike Massonnet <mmassonnet at xfce.org>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Ouvrir une image"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Impossible d’ouvrir le fichier"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Ouvrir un répertoire"
-#: ../src/main_window.c:1390
-msgid "Are you sure you want to clear ristretto's list of recently opened documents?"
-msgstr "Êtes-vous certain de vouloir supprimer la liste des documents récemment ouverts de Ristretto ?"
+#: ../src/main_window.c:1467
+msgid ""
+"Are you sure you want to clear ristretto's list of recently opened documents?"
+msgstr ""
+"Êtes-vous certain de vouloir supprimer la liste des documents récemment "
+"ouverts de Ristretto ?"
#: ../ristretto.desktop.in.h:1
msgid "Image Viewer"
@@ -186,8 +205,9 @@
#~ msgid "Behaviour"
#~ msgstr "Comportement"
+
#~ msgid "Flip _Vertically"
#~ msgstr "Retourner _verticalement"
+
#~ msgid "Flip _Horizontally"
#~ msgstr "Retourner _horizontalement"
-
Modified: ristretto/trunk/po/hu.po
===================================================================
--- ristretto/trunk/po/hu.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/hu.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-11-02 12:25+0100\n"
"Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian at lists.d.o>\n"
@@ -28,147 +28,159 @@
"A %s --help adja az elérhető lehetőségek litáját.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Fájl"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "Ma_ppa megnyitása"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "Utóbbiak"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "Sz_erkeszt"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "Megnyitás ezzel..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Nincs elérhető alkalmazás"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "Nézet"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
#, fuzzy
msgid "Show _Toolbar"
msgstr "Eszközsáv mutatása"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "Előkép néző"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr ""
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "Vízszintesen mutat"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "Függőlegesen mutat"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "Rejt"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr ""
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr ""
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "U_grás"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Súgó"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
#, fuzzy
msgid "Image viewer Preferences"
msgstr "Kép-néző"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr ""
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr ""
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr ""
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
msgstr ""
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
msgstr ""
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr ""
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Fejlesztő:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr "A Ristretto egy gyors, könnyű nézegető az Xfce asztali környezethez."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "SZERVÁC Attila"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Kép megnyitása"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Nem tudtam megnyitni a fájlt"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Mappa megnyitása"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr "Tényleg törlöd a legutóbbi dokumentumok listáját?"
Modified: ristretto/trunk/po/lv.po
===================================================================
--- ristretto/trunk/po/lv.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/lv.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto 0.0.1-svn-r02537\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-11-11 20:37+0300\n"
"Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
"Language-Team: Latvian <rprieditis at inbox.lv>\n"
@@ -30,104 +30,116 @@
"Mēģiniet %s --help , lai redzētu pilnu pieejamo komandu sarakstu.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Fails"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "A_tvērt Mapi"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Nesenie"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Rediģēt"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "Atvert ar..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Nav pieejama neviena lietotne"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Skats"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
#, fuzzy
msgid "Show _Toolbar"
msgstr "Rādīt Rīkjoslu"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "Sīktēlu Skatītājs"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr ""
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "Rādit Horizontāli"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "Rādit Vertikāli"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "Slēpt"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr ""
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr ""
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Doties"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Palīdzība"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr "Attēlu skatītāja uzstādījumi"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr "Slīdrāde"
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr "Noildze"
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr "Pirmsielāde"
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
@@ -135,7 +147,7 @@
"Noildze attēla rādīšanai slīdrādē\n"
"(sekundēs)"
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
@@ -143,37 +155,37 @@
"Ielādēt attēlus slīdrāde laikā\n"
"(aizņem vairāk atmiņas)"
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr "_Pirmsielādes attēli"
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Izstrādātājs:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr "Ristretto ir ātrs un viegls attēlu skatītājs Xfce Videi."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Tūlkotāji:"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Atvērt attēlu"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Nevarēju atvērt failu"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Atvērt mapi"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/nb_NO.po
===================================================================
--- ristretto/trunk/po/nb_NO.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/nb_NO.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-08-29 21:12+0200\n"
"Last-Translator: Terje Uriansrud <ter at operamail.com>\n"
"Language-Team: Norwegian Bokmal\n"
@@ -29,147 +29,159 @@
msgstr ""
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Fil"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "Åp_ne mappe"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "Nylig _brukt"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Rediger"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr ""
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr ""
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Vis"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr ""
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "Miniatyrvisning"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
#, fuzzy
msgid "_Rotate"
msgstr "Roter _venstre"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "Vis vannrett"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "Vis loddrett"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "Skjul"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "Roter _høyre"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "Roter _venstre"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Gå"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Hjelp"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
#, fuzzy
msgid "Image viewer Preferences"
msgstr "Bildefremviser"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr ""
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr ""
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr ""
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
msgstr ""
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
msgstr ""
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr ""
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Utvikler:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr "Ristretto er en rask og lettvekts bildefremviser for Xfce skrivebordet"
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Oversettelser"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Åpne bilde"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr ""
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Åpne mappe"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/nl.po
===================================================================
--- ristretto/trunk/po/nl.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/nl.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto 0.0.1-svn-r02537\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-07-13 00:48+0200\n"
"Last-Translator: Stephan Arts <stephan at xfce.org>\n"
"Language-Team: Dutch\n"
@@ -31,99 +31,111 @@
"Probeer %s --help voor een lijst van beschikbare commando regel opties.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Bestand"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "Map o_penen"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "_Recent geopend"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "B_ewerken"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "_Openen met..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Geen programma's beschikbaar"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "Beel_d"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr "_Toon Werkbalk"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
msgid "Thumbnail _Viewer"
msgstr "_Miniatuur Weergave"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr "_Zoomen"
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr "_Roteren"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
msgid "Show _Horizontally"
msgstr "_Horizontaal tonen"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
msgid "Show _Vertically"
msgstr "_Verticaal tonen"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
msgid "H_ide"
msgstr "Ver_bergen"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "_Rechtsom draaien"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "_Linksom draaien"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Ga"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_Help"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr "Afbeeldingsweergave voorkeuren"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr "Diaweergave"
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr "Weergave"
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr "Achtergrond kleur"
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr "Achtergr_ondkleur wijzigen:"
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr "Timeout"
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr "Vooruit laden"
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
@@ -131,7 +143,7 @@
"De tijd dat individuele afbeeldingen worden weergegeven gedurende een\n"
"diaweergave (in seconden)"
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
@@ -139,15 +151,15 @@
"Afbeeldingen vooraf inladen gedurende een diaweergave\n"
"(gebruikt meer geheugen)"
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr "_Afbeeldingen vooruit inladen"
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Ontwikkelaar:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
@@ -155,23 +167,23 @@
"Ristretto is een snel en lichtgewicht afbeeldingsweergave-programma voor de "
"Xfce-desktop omgeving"
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Stephan Arts <stephan at xfce.org>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Afbeelding openen"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Kan bestand niet openen"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Map openen"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/pt_BR.po
===================================================================
--- ristretto/trunk/po/pt_BR.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/pt_BR.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: 0.0.10\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-11-29 00:30-0500\n"
"Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -33,99 +33,111 @@
"disponíveis.\n"
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_Arquivo"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "A_brir Pasta"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr "Usado _recentemente"
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_Editar"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr "Abrir com..."
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr "Nenhuma aplicação disponível"
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_Ver"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr "Mostrar _Barra de Ferramentas"
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
msgid "Thumbnail _Viewer"
msgstr "_Visualizador de Miniaturas"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr "_Ampliar"
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
msgid "_Rotate"
msgstr "_Girar"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
msgid "Show _Horizontally"
msgstr "Mostrar _Horizontalmente"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
msgid "Show _Vertically"
msgstr "Mostrar _Verticalmente"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
msgid "H_ide"
msgstr "Ocu_ltar"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "Girar para _Direita"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "Girar para _Esquerda"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_Ir"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "Aj_uda"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr "Preferências do Visualizador de Imagens"
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr "Apresentação de Slides"
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr "Tempo de Espera"
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr "Pré-carregamento"
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
@@ -134,7 +146,7 @@
"slides\n"
"(em segundos)"
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
@@ -142,15 +154,15 @@
"Pré-Carregar imagens durante uma apresentação de slides\n"
"(usa mais memória)"
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr "Carregar imagens _previamente"
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "Desenvolvedor:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
@@ -158,24 +170,24 @@
"Ristretto é um visualizador de imagens rápido e leve para o ambiente de "
"trabalho do Xfce."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "Og Maciel <ogmaciel at gnome.org>,\n"
"Fábio Nogueira <deb-user-ba at ubuntu.com>"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "Abrir imagem"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr "Não foi possível abrir arquivo"
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "Abrir pasta"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/po/ur.po
===================================================================
--- ristretto/trunk/po/ur.po 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/po/ur.po 2007-11-30 23:14:24 UTC (rev 3654)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-11-25 11:02+0100\n"
+"POT-Creation-Date: 2007-11-30 16:10+0100\n"
"PO-Revision-Date: 2007-10-26 14:37+0500\n"
"Last-Translator: Muhammad Ali Makki <makk.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -31,147 +31,159 @@
msgstr ""
#. Create 'File' menu
-#: ../src/main_window.c:310
+#: ../src/main_window.c:314
msgid "_File"
msgstr "_فائل"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:321
msgid "O_pen Folder"
msgstr "ف_ولڈر کھولیں"
-#: ../src/main_window.c:318
+#: ../src/main_window.c:322
msgid "_Recently used"
msgstr ""
#. Create 'Edit' menu
-#: ../src/main_window.c:350
+#: ../src/main_window.c:354
msgid "_Edit"
msgstr "_تدوین"
-#: ../src/main_window.c:355 ../src/main_window.c:579
+#: ../src/main_window.c:359 ../src/main_window.c:596
msgid "Open with..."
msgstr ""
-#: ../src/main_window.c:363 ../src/main_window.c:590
+#: ../src/main_window.c:367 ../src/main_window.c:607
msgid "No applications available"
msgstr ""
#. Create 'View' menu
-#: ../src/main_window.c:372
+#: ../src/main_window.c:376
msgid "_View"
msgstr "_منظر"
-#: ../src/main_window.c:379
+#: ../src/main_window.c:383
msgid "Show _Toolbar"
msgstr ""
-#: ../src/main_window.c:380
+#: ../src/main_window.c:384
#, fuzzy
msgid "Thumbnail _Viewer"
msgstr "تھمبنیل منظرکار"
-#: ../src/main_window.c:384
+#: ../src/main_window.c:388
msgid "_Zooming"
msgstr ""
-#: ../src/main_window.c:385
+#: ../src/main_window.c:389
#, fuzzy
msgid "_Rotate"
msgstr "_بائیں گھمائیں"
-#: ../src/main_window.c:411
+#: ../src/main_window.c:415
#, fuzzy
msgid "Show _Horizontally"
msgstr "افقی دکھائیں"
-#: ../src/main_window.c:415
+#: ../src/main_window.c:419
#, fuzzy
msgid "Show _Vertically"
msgstr "عمودی دکھائیں"
-#: ../src/main_window.c:419
+#: ../src/main_window.c:423
#, fuzzy
msgid "H_ide"
msgstr "چھپائیں"
-#: ../src/main_window.c:456
+#: ../src/main_window.c:460
msgid "Rotate _Right"
msgstr "_دائیں گھمائیں"
-#: ../src/main_window.c:457
+#: ../src/main_window.c:461
msgid "Rotate _Left"
msgstr "_بائیں گھمائیں"
#. Create 'Go' menu
-#: ../src/main_window.c:465
+#: ../src/main_window.c:482
msgid "_Go"
msgstr "_جائیں"
#. Create 'Help' menu
-#: ../src/main_window.c:494
+#: ../src/main_window.c:511
msgid "_Help"
msgstr "_ہدایات"
-#: ../src/main_window.c:1128
+#: ../src/main_window.c:1161
msgid "Image viewer Preferences"
msgstr ""
-#: ../src/main_window.c:1145
+#: ../src/main_window.c:1178
msgid "Slideshow"
msgstr ""
-#: ../src/main_window.c:1149
+#: ../src/main_window.c:1182
+msgid "Display"
+msgstr ""
+
+#: ../src/main_window.c:1186
+msgid "Background Color"
+msgstr ""
+
+#: ../src/main_window.c:1188
+msgid "_Override Background Color:"
+msgstr ""
+
+#: ../src/main_window.c:1212
msgid "Timeout"
msgstr ""
-#: ../src/main_window.c:1152
+#: ../src/main_window.c:1215
msgid "Preload"
msgstr ""
-#: ../src/main_window.c:1157
+#: ../src/main_window.c:1220
msgid ""
"The time individual images are displayed during a slideshow\n"
"(in seconds)"
msgstr ""
-#: ../src/main_window.c:1161
+#: ../src/main_window.c:1224
msgid ""
"Preload images during slideshow\n"
"(uses more memory)"
msgstr ""
-#: ../src/main_window.c:1162
+#: ../src/main_window.c:1225
msgid "_Preload images"
msgstr ""
-#: ../src/main_window.c:1203
+#: ../src/main_window.c:1280
msgid "Developer:"
msgstr "ڈویلپر:"
-#: ../src/main_window.c:1213
+#: ../src/main_window.c:1290
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr ""
"Ristretto ایکسفس ڈیسک ٹاپ ماحول کے لیے ایک ہلکا پھلکا تصاویر منظرکار ہے."
-#: ../src/main_window.c:1221
+#: ../src/main_window.c:1298
msgid "translator-credits"
msgstr "ترجمہ-کریڈٹ"
-#: ../src/main_window.c:1241
+#: ../src/main_window.c:1318
msgid "Open image"
msgstr "تصویر کھولیں"
-#: ../src/main_window.c:1276
+#: ../src/main_window.c:1353
msgid "Could not open file"
msgstr ""
-#: ../src/main_window.c:1286
+#: ../src/main_window.c:1363
msgid "Open folder"
msgstr "فولڈر کھولیں"
-#: ../src/main_window.c:1390
+#: ../src/main_window.c:1467
msgid ""
"Are you sure you want to clear ristretto's list of recently opened documents?"
msgstr ""
Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/src/main.c 2007-11-30 23:14:24 UTC (rev 3654)
@@ -98,8 +98,12 @@
gboolean override_bg_color = xfce_rc_read_bool_entry (xfce_rc, "OverrideBgColor", FALSE);
if (override_bg_color)
{
+ const gchar *color = xfce_rc_read_entry(xfce_rc, "BgColor", "#000000000000");
bg_color = g_new0(GdkColor, 1);
- bg_color->pixel = xfce_rc_read_int_entry(xfce_rc, "BgColor", 0);
+ if(!gdk_color_parse(color, bg_color))
+ {
+ g_debug("parse failed");
+ }
}
GtkWidget *window = rstto_main_window_new();
@@ -115,6 +119,183 @@
GtkRecentManager *recent_manager = rstto_main_window_get_recent_manager(RSTTO_MAIN_WINDOW(window));
rstto_navigator_set_timeout(navigator, slideshow_timeout);
+ /* When more then one file is provided over the CLI,
+ * just open those files and don't index the folder
+ */
+ if (argc > 2)
+ {
+ for (n = 1; n < argc; ++n)
+ {
+ ThunarVfsPath *path;
+ if (g_path_is_absolute(argv[n]))
+ path = thunar_vfs_path_new(argv[n], NULL);
+ else
+ {
+ gchar *base_dir = g_get_current_dir();
+
+ path_dir = g_build_path("/", base_dir, argv[n], NULL);
+ path = thunar_vfs_path_new(path_dir, NULL);
+
+ g_free(base_dir);
+ }
+
+ if (path)
+ {
+
+ ThunarVfsInfo *info = thunar_vfs_info_new_for_path(path, NULL);
+ if(info)
+ {
+ if(strcmp(thunar_vfs_mime_info_get_name(info->mime_info), "inode/directory"))
+ {
+ gchar *file_media = thunar_vfs_mime_info_get_media(info->mime_info);
+ if(!strcmp(file_media, "image"))
+ {
+ RsttoNavigatorEntry *entry = rstto_navigator_entry_new(navigator, info);
+ gint i = rstto_navigator_add (navigator, entry);
+ rstto_navigator_set_file(navigator, i);
+ }
+ }
+ else
+ {
+ GDir *dir = g_dir_open(argv[n], 0, NULL);
+ const gchar *filename = g_dir_read_name(dir);
+ while (filename)
+ {
+ gchar *path_name = g_strconcat(argv[n], "/", filename, NULL);
+ ThunarVfsPath *file_path = thunar_vfs_path_new(path_name, NULL);
+ if (file_path)
+ {
+ ThunarVfsInfo *file_info = thunar_vfs_info_new_for_path(file_path, NULL);
+ gchar *file_media = thunar_vfs_mime_info_get_media(file_info->mime_info);
+ if(!strcmp(file_media, "image"))
+ {
+ RsttoNavigatorEntry *entry = rstto_navigator_entry_new(navigator, file_info);
+ rstto_navigator_add (navigator, entry);
+ }
+ g_free(file_media);
+ thunar_vfs_path_unref(file_path);
+ }
+ g_free(path_name);
+ filename = g_dir_read_name(dir);
+ }
+ rstto_navigator_jump_first(navigator);
+ g_dir_close(dir);
+ }
+
+ gchar *uri = thunar_vfs_path_dup_uri(info->path);
+ gtk_recent_manager_add_item(recent_manager, uri);
+ g_free(uri);
+
+ }
+ }
+ }
+ }
+ else
+ {
+ if (argc == 2)
+ {
+ ThunarVfsPath *path;
+ if (g_path_is_absolute(argv[1]))
+ path = thunar_vfs_path_new(argv[1], NULL);
+ else
+ {
+ gchar *base_dir = g_get_current_dir();
+
+ path_dir = g_build_path("/", base_dir, argv[1], NULL);
+ path = thunar_vfs_path_new(path_dir, NULL);
+
+ g_free(base_dir);
+ }
+
+ if (path)
+ {
+
+ ThunarVfsInfo *info = thunar_vfs_info_new_for_path(path, NULL);
+ if(info)
+ {
+ if(strcmp(thunar_vfs_mime_info_get_name(info->mime_info), "inode/directory"))
+ {
+ ThunarVfsPath *_path = thunar_vfs_path_get_parent(path);
+ thunar_vfs_path_unref(path);
+ path = _path;
+
+ gchar *path_string = thunar_vfs_path_dup_string(path);
+
+ GDir *dir = g_dir_open(path_string, 0, NULL);
+ const gchar *filename = g_dir_read_name(dir);
+ while (filename)
+ {
+ gchar *path_name = g_strconcat(path_string, "/", filename, NULL);
+ ThunarVfsPath *file_path = thunar_vfs_path_new(path_name, NULL);
+ if (file_path)
+ {
+ ThunarVfsInfo *file_info = thunar_vfs_info_new_for_path(file_path, NULL);
+ gchar *file_media = thunar_vfs_mime_info_get_media(file_info->mime_info);
+ if(!strcmp(file_media, "image"))
+ {
+ RsttoNavigatorEntry *entry = rstto_navigator_entry_new(navigator, file_info);
+ gint i = rstto_navigator_add (navigator, entry);
+ if (path_dir == NULL)
+ {
+ if (!strcmp(path_name, argv[1]))
+ {
+ rstto_navigator_set_file(navigator, i);
+ }
+ }
+ else
+ {
+ if (!strcmp(path_name, path_dir))
+ {
+ rstto_navigator_set_file(navigator, i);
+ }
+
+ }
+ }
+ g_free(file_media);
+ thunar_vfs_path_unref(file_path);
+ }
+ g_free(path_name);
+ filename = g_dir_read_name(dir);
+ }
+ g_dir_close(dir);
+ g_free(path_string);
+ }
+ else
+ {
+ GDir *dir = g_dir_open(argv[1], 0, NULL);
+ const gchar *filename = g_dir_read_name(dir);
+ while (filename)
+ {
+ gchar *path_name = g_strconcat(argv[1], "/", filename, NULL);
+ ThunarVfsPath *file_path = thunar_vfs_path_new(path_name, NULL);
+ if (file_path)
+ {
+ ThunarVfsInfo *file_info = thunar_vfs_info_new_for_path(file_path, NULL);
+ gchar *file_media = thunar_vfs_mime_info_get_media(file_info->mime_info);
+ if(!strcmp(file_media, "image"))
+ {
+ RsttoNavigatorEntry *entry = rstto_navigator_entry_new(navigator, file_info);
+ rstto_navigator_add (navigator, entry);
+ }
+ g_free(file_media);
+ thunar_vfs_path_unref(file_path);
+ }
+ g_free(path_name);
+ filename = g_dir_read_name(dir);
+ }
+ rstto_navigator_jump_first(navigator);
+ g_dir_close(dir);
+ }
+ gchar *uri = thunar_vfs_path_dup_uri(info->path);
+ gtk_recent_manager_add_item(recent_manager, uri);
+ g_free(uri);
+ }
+ thunar_vfs_path_unref(path);
+ }
+
+ }
+ }
+ /*
for (n = 1; n < argc; ++n)
{
ThunarVfsPath *path;
@@ -216,6 +397,7 @@
thunar_vfs_path_unref(path);
}
}
+*/
g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
@@ -233,6 +415,7 @@
if (bg_color)
{
rstto_main_window_set_pv_bg_color(RSTTO_MAIN_WINDOW(window), bg_color);
+ g_free(bg_color);
}
@@ -244,7 +427,7 @@
gtk_main();
- bg_color = rstto_main_window_get_pv_bg_color(RSTTO_MAIN_WINDOW(window));
+ bg_color = (GdkColor *)rstto_main_window_get_pv_bg_color(RSTTO_MAIN_WINDOW(window));
xfce_rc_write_bool_entry(xfce_rc, "ShowToolBar", rstto_main_window_get_show_toolbar(RSTTO_MAIN_WINDOW(window)));
xfce_rc_write_bool_entry(xfce_rc, "PreloadDuringSlideShow", navigator->preload);
@@ -252,7 +435,7 @@
if (bg_color)
{
xfce_rc_write_bool_entry(xfce_rc, "OverrideBgColor", TRUE);
- xfce_rc_write_int_entry(xfce_rc, "BgColor", bg_color->pixel);
+ xfce_rc_write_entry(xfce_rc, "BgColor", gdk_color_to_string(bg_color));
}
else
{
Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/src/main_window.c 2007-11-30 23:14:24 UTC (rev 3654)
@@ -240,6 +240,9 @@
cb_rstto_main_window_preferences(GtkWidget *widget, RsttoMainWindow *window);
static void
+cb_rstto_bg_color_override_check_toggled(GtkToggleButton *button, GtkWidget *);
+
+static void
cb_rstto_main_window_nav_iter_changed(RsttoNavigator *navigator, gint nr, RsttoNavigatorEntry *entry, RsttoMainWindow *window);
static void
cb_rstto_main_window_nav_new_entry(RsttoNavigator *navigator, gint nr, RsttoNavigatorEntry *entry, RsttoMainWindow *window);
@@ -1107,7 +1110,7 @@
rstto_picture_viewer_set_bg_color(RSTTO_PICTURE_VIEWER(window->priv->picture_viewer), color);
- gdk_color_free(color);
+ g_free(color);
}
else
{
@@ -1149,7 +1152,7 @@
GdkColor *color = NULL;
if (rstto_picture_viewer_get_bg_color(RSTTO_PICTURE_VIEWER(window->priv->picture_viewer)))
{
- color = gdk_color_copy(rstto_picture_viewer_get_bg_color(RSTTO_PICTURE_VIEWER(window->priv->picture_viewer)));
+ color = gdk_color_copy(rstto_main_window_get_pv_bg_color(window));
}
GtkWidget *slideshow_main_vbox;
GtkWidget *slideshow_main_lbl;
@@ -1182,16 +1185,26 @@
GtkWidget *bg_color_vbox = gtk_vbox_new(FALSE, 0);
GtkWidget *bg_color_frame = xfce_create_framebox_with_content (_("Background Color"), bg_color_vbox);
- GtkWidget *bg_color_override_check = gtk_check_button_new_with_mnemonic(_("_Override Background Color"));
+ GtkWidget *bg_color_override_check = gtk_check_button_new_with_mnemonic(_("_Override Background Color:"));
+ GtkWidget *bg_hbox = gtk_hbox_new(FALSE, 4);
GtkWidget *bg_color_button = gtk_color_button_new();
- gtk_box_pack_start(GTK_BOX(bg_color_vbox), bg_color_override_check, FALSE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(bg_color_vbox), bg_color_button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(bg_hbox), bg_color_override_check, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(bg_hbox), bg_color_button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(bg_color_vbox), bg_hbox, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(bg_color_override_check), "toggled", (GCallback)cb_rstto_bg_color_override_check_toggled, bg_color_button);
+
if (color)
{
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bg_color_override_check), TRUE);
gtk_color_button_set_color(GTK_COLOR_BUTTON(bg_color_button), color);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bg_color_override_check), TRUE);
+ gdk_color_free(color);
+ color = NULL;
}
+ else
+ {
+ gtk_widget_set_sensitive(bg_color_button, FALSE);
+ }
gtk_container_set_border_width (GTK_CONTAINER (bg_color_frame), 8);
@@ -1243,13 +1256,10 @@
window->priv->navigator->preload = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(preload_check));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(bg_color_override_check)) == TRUE)
{
- if (color == NULL)
- {
- color = g_new0(GdkColor, 1);
- }
- gtk_color_button_get_color(GTK_COLOR_BUTTON(bg_color_button), color);
- rstto_main_window_set_pv_bg_color(window, color);
- gdk_color_free(color);
+ GdkColor *new_color = g_new0(GdkColor, 1);
+ gtk_color_button_get_color(GTK_COLOR_BUTTON(bg_color_button), new_color);
+ rstto_main_window_set_pv_bg_color(window, new_color);
+ g_free(new_color);
}
else
{
@@ -1841,3 +1851,17 @@
/*return rstto_picture_viewer_get_bg_color(RSTTO_PICTURE_VIEWER(window->priv->picture_viewer));*/
return window->priv->settings.bg_color;
}
+
+static void
+cb_rstto_bg_color_override_check_toggled(GtkToggleButton *button, GtkWidget *widget)
+{
+ if (gtk_toggle_button_get_active(button) == TRUE)
+ {
+ gtk_widget_set_sensitive(widget, TRUE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive(widget, FALSE);
+
+ }
+}
Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/src/picture_viewer.c 2007-11-30 23:14:24 UTC (rev 3654)
@@ -1066,6 +1066,8 @@
if (color)
{
viewer->priv->bg_color = gdk_color_copy(color);
+ GdkColormap *colormap = gtk_widget_get_colormap(GTK_WIDGET(viewer));
+ gdk_colormap_alloc_color(colormap, viewer->priv->bg_color, TRUE, TRUE);
}
}
Modified: ristretto/trunk/src/thumbnail_viewer.c
===================================================================
--- ristretto/trunk/src/thumbnail_viewer.c 2007-11-30 01:28:28 UTC (rev 3653)
+++ ristretto/trunk/src/thumbnail_viewer.c 2007-11-30 23:14:24 UTC (rev 3654)
@@ -419,17 +419,21 @@
static void
cb_rstto_thumbnail_viewer_nav_new_entry(RsttoNavigator *nav, gint nr, RsttoNavigatorEntry *entry, RsttoThumbnailViewer *viewer)
{
- if ((nr < viewer->priv->begin))
+ GtkWidget *widget = GTK_WIDGET(viewer);
+ if (GTK_WIDGET_REALIZED(viewer))
{
- viewer->priv->offset -= viewer->priv->dimension;
- }
- /* only paint if the entry is within the visible range */
- if ((nr > viewer->priv->begin) && (nr < viewer->priv->end))
- {
- if (GTK_WIDGET_REALIZED(viewer))
+
+ gint min = nr - (((widget->allocation.width - viewer->priv->dimension) / 2) / viewer->priv->dimension) - 1;
+ gint max = nr + (((widget->allocation.width - viewer->priv->dimension) / 2) / viewer->priv->dimension) + 1;
+ if ((nr < viewer->priv->begin))
{
- rstto_thumbnail_viewer_paint(viewer);
+ viewer->priv->offset -= viewer->priv->dimension;
}
+ /* only paint if the entry is within the visible range */
+ if (((nr > min) && (nr < max)))
+ {
+ rstto_thumbnail_viewer_paint(viewer);
+ }
}
}
More information about the Goodies-commits
mailing list