Also draw the icons when idle

This commit is contained in:
Pierre Pronchery 2011-08-01 11:48:53 +00:00
parent 14cd1f2e0b
commit 645bfd56cc
5 changed files with 111 additions and 103 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 00:18+0200\n"
"POT-Creation-Date: 2011-08-01 13:48+0200\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n"
@ -113,7 +113,7 @@ msgstr ""
msgid "_Help"
msgstr "_Hilfe"
#: ../src/browser.c:184 ../src/desktop.c:964 ../src/desktop.c:985
#: ../src/browser.c:184 ../src/desktop.c:972 ../src/desktop.c:993
msgid "Back"
msgstr "Zurück"
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:192 ../src/desktop.c:1046
#: ../src/browser.c:192 ../src/desktop.c:1054
msgid "Home"
msgstr "Persönlicher Ordner"
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:742 ../src/browser.c:746 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452
#: ../src/desktop.c:1655 ../src/desktop.c:1660 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -206,7 +206,7 @@ msgstr ""
msgid "Shell scripts"
msgstr ""
#: ../src/browser.c:963 ../src/desktop.c:661 ../src/view.c:436
#: ../src/browser.c:963 ../src/desktop.c:669 ../src/view.c:436
msgid "All files"
msgstr "Alle Dateien"
@ -335,7 +335,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr "Aktualisierung..."
#: ../src/callbacks.c:116 ../src/desktop.c:539
#: ../src/callbacks.c:116 ../src/desktop.c:547
msgid "New folder"
msgstr "Neu Ordner"
@ -354,19 +354,19 @@ msgstr ""
msgid "New"
msgstr "Neu"
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:450
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:458
msgid "Folder"
msgstr "Ordner"
#: ../src/callbacks.c:784 ../src/desktop.c:458
#: ../src/callbacks.c:784 ../src/desktop.c:466
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:788 ../src/desktop.c:462
#: ../src/callbacks.c:788 ../src/desktop.c:470
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:823 ../src/desktop.c:558
#: ../src/callbacks.c:823 ../src/desktop.c:566
msgid "New text file.txt"
msgstr ""
@ -415,7 +415,7 @@ msgstr ""
msgid "Copying: "
msgstr ""
#: ../src/copy.c:152 ../src/desktop.c:644
#: ../src/copy.c:152 ../src/desktop.c:652
msgid "Filename: "
msgstr ""
@ -500,59 +500,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:615
#: ../src/desktop.c:623
msgid "Desktop preferences"
msgstr "Desktop Einstellungen"
#: ../src/desktop.c:636
#: ../src/desktop.c:644
msgid "Default color: "
msgstr ""
#: ../src/desktop.c:648 ../src/desktop.c:686
#: ../src/desktop.c:656 ../src/desktop.c:694
msgid "Background"
msgstr "Hintergrund"
#: ../src/desktop.c:651
#: ../src/desktop.c:659
msgid "Picture files"
msgstr "Bilder"
#: ../src/desktop.c:669
#: ../src/desktop.c:677
msgid "Position: "
msgstr ""
#: ../src/desktop.c:675
#: ../src/desktop.c:683
msgid "Centered"
msgstr ""
#: ../src/desktop.c:677
#: ../src/desktop.c:685
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:679
#: ../src/desktop.c:687
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:681
#: ../src/desktop.c:689
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:692
#: ../src/desktop.c:700
msgid "Desktop font: "
msgstr ""
#: ../src/desktop.c:701
#: ../src/desktop.c:709
msgid "Theme"
msgstr ""
#: ../src/desktop.c:1077
#: ../src/desktop.c:1085
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1696
#: ../src/desktop.c:1704
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1801
#: ../src/desktop.c:1809
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 00:18+0200\n"
"POT-Creation-Date: 2011-08-01 13:48+0200\n"
"PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n"
@ -113,7 +113,7 @@ msgstr ""
msgid "_Help"
msgstr ""
#: ../src/browser.c:184 ../src/desktop.c:964 ../src/desktop.c:985
#: ../src/browser.c:184 ../src/desktop.c:972 ../src/desktop.c:993
msgid "Back"
msgstr ""
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:192 ../src/desktop.c:1046
#: ../src/browser.c:192 ../src/desktop.c:1054
msgid "Home"
msgstr "Inicio"
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:742 ../src/browser.c:746 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452
#: ../src/desktop.c:1655 ../src/desktop.c:1660 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -206,7 +206,7 @@ msgstr ""
msgid "Shell scripts"
msgstr ""
#: ../src/browser.c:963 ../src/desktop.c:661 ../src/view.c:436
#: ../src/browser.c:963 ../src/desktop.c:669 ../src/view.c:436
msgid "All files"
msgstr ""
@ -335,7 +335,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr ""
#: ../src/callbacks.c:116 ../src/desktop.c:539
#: ../src/callbacks.c:116 ../src/desktop.c:547
msgid "New folder"
msgstr ""
@ -354,19 +354,19 @@ msgstr ""
msgid "New"
msgstr ""
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:450
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:458
msgid "Folder"
msgstr ""
#: ../src/callbacks.c:784 ../src/desktop.c:458
#: ../src/callbacks.c:784 ../src/desktop.c:466
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:788 ../src/desktop.c:462
#: ../src/callbacks.c:788 ../src/desktop.c:470
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:823 ../src/desktop.c:558
#: ../src/callbacks.c:823 ../src/desktop.c:566
msgid "New text file.txt"
msgstr ""
@ -415,7 +415,7 @@ msgstr ""
msgid "Copying: "
msgstr ""
#: ../src/copy.c:152 ../src/desktop.c:644
#: ../src/copy.c:152 ../src/desktop.c:652
msgid "Filename: "
msgstr ""
@ -500,59 +500,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:615
#: ../src/desktop.c:623
msgid "Desktop preferences"
msgstr "Desktop preferencias"
#: ../src/desktop.c:636
#: ../src/desktop.c:644
msgid "Default color: "
msgstr ""
#: ../src/desktop.c:648 ../src/desktop.c:686
#: ../src/desktop.c:656 ../src/desktop.c:694
msgid "Background"
msgstr ""
#: ../src/desktop.c:651
#: ../src/desktop.c:659
msgid "Picture files"
msgstr ""
#: ../src/desktop.c:669
#: ../src/desktop.c:677
msgid "Position: "
msgstr ""
#: ../src/desktop.c:675
#: ../src/desktop.c:683
msgid "Centered"
msgstr ""
#: ../src/desktop.c:677
#: ../src/desktop.c:685
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:679
#: ../src/desktop.c:687
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:681
#: ../src/desktop.c:689
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:692
#: ../src/desktop.c:700
msgid "Desktop font: "
msgstr ""
#: ../src/desktop.c:701
#: ../src/desktop.c:709
msgid "Theme"
msgstr ""
#: ../src/desktop.c:1077
#: ../src/desktop.c:1085
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1696
#: ../src/desktop.c:1704
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1801
#: ../src/desktop.c:1809
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 00:18+0200\n"
"POT-Creation-Date: 2011-08-01 13:48+0200\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -113,7 +113,7 @@ msgstr "_Vue"
msgid "_Help"
msgstr "_Aide"
#: ../src/browser.c:184 ../src/desktop.c:964 ../src/desktop.c:985
#: ../src/browser.c:184 ../src/desktop.c:972 ../src/desktop.c:993
msgid "Back"
msgstr "Retour"
@ -129,7 +129,7 @@ msgstr "Suivant"
msgid "Refresh"
msgstr "Rafraîchir"
#: ../src/browser.c:192 ../src/desktop.c:1046
#: ../src/browser.c:192 ../src/desktop.c:1054
msgid "Home"
msgstr "Dossier personnel"
@ -187,7 +187,7 @@ msgstr " Chemin : "
#: ../src/browser.c:742 ../src/browser.c:746 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452
#: ../src/desktop.c:1655 ../src/desktop.c:1660 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -206,7 +206,7 @@ msgstr "Fichiers exécutables"
msgid "Shell scripts"
msgstr "Scripts shell"
#: ../src/browser.c:963 ../src/desktop.c:661 ../src/view.c:436
#: ../src/browser.c:963 ../src/desktop.c:669 ../src/view.c:436
msgid "All files"
msgstr "Tous les fichiers"
@ -335,7 +335,7 @@ msgstr "Modifier avec :"
msgid "Refreshing folder..."
msgstr "Actualisation du dossier..."
#: ../src/callbacks.c:116 ../src/desktop.c:539
#: ../src/callbacks.c:116 ../src/desktop.c:547
msgid "New folder"
msgstr "Nouveau dossier"
@ -354,19 +354,19 @@ msgstr "Voulez-vous vraiment effacer %lu fichier(s)?"
msgid "New"
msgstr "Nouveau"
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:450
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:458
msgid "Folder"
msgstr "Dossier"
#: ../src/callbacks.c:784 ../src/desktop.c:458
#: ../src/callbacks.c:784 ../src/desktop.c:466
msgid "Symbolic link..."
msgstr "Lien symbolique..."
#: ../src/callbacks.c:788 ../src/desktop.c:462
#: ../src/callbacks.c:788 ../src/desktop.c:470
msgid "Text file"
msgstr "Fichier texte"
#: ../src/callbacks.c:823 ../src/desktop.c:558
#: ../src/callbacks.c:823 ../src/desktop.c:566
msgid "New text file.txt"
msgstr "Nouveau fichier texte.txt"
@ -415,7 +415,7 @@ msgstr "Copie de fichier(s)"
msgid "Copying: "
msgstr "Copie de : "
#: ../src/copy.c:152 ../src/desktop.c:644
#: ../src/copy.c:152 ../src/desktop.c:652
msgid "Filename: "
msgstr "Nom de fichier : "
@ -520,59 +520,59 @@ msgstr ""
" -R\tSupprimer récursivement\n"
" -r\tÉquivalent à -R\n"
#: ../src/desktop.c:615
#: ../src/desktop.c:623
msgid "Desktop preferences"
msgstr "Préférences du bureau"
#: ../src/desktop.c:636
#: ../src/desktop.c:644
msgid "Default color: "
msgstr "Couleur par défaut :"
#: ../src/desktop.c:648 ../src/desktop.c:686
#: ../src/desktop.c:656 ../src/desktop.c:694
msgid "Background"
msgstr "Arrière-plan"
#: ../src/desktop.c:651
#: ../src/desktop.c:659
msgid "Picture files"
msgstr "Images"
#: ../src/desktop.c:669
#: ../src/desktop.c:677
msgid "Position: "
msgstr "Position : "
#: ../src/desktop.c:675
#: ../src/desktop.c:683
msgid "Centered"
msgstr "Centré"
#: ../src/desktop.c:677
#: ../src/desktop.c:685
msgid "Scaled"
msgstr "Étiré"
#: ../src/desktop.c:679
#: ../src/desktop.c:687
msgid "Scaled (keep ratio)"
msgstr "Étiré (sans déformer)"
#: ../src/desktop.c:681
#: ../src/desktop.c:689
msgid "Tiled"
msgstr "Mosaïque"
#: ../src/desktop.c:692
#: ../src/desktop.c:700
msgid "Desktop font: "
msgstr "Police du bureau : "
#: ../src/desktop.c:701
#: ../src/desktop.c:709
msgid "Theme"
msgstr "Thème"
#: ../src/desktop.c:1077
#: ../src/desktop.c:1085
msgid "Applications"
msgstr "Applications"
#: ../src/desktop.c:1696
#: ../src/desktop.c:1704
msgid "Could not load preferences"
msgstr "Impossible de charger les préférences"
#: ../src/desktop.c:1801
#: ../src/desktop.c:1809
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 00:18+0200\n"
"POT-Creation-Date: 2011-08-01 13:48+0200\n"
"PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n"
@ -113,7 +113,7 @@ msgstr ""
msgid "_Help"
msgstr ""
#: ../src/browser.c:184 ../src/desktop.c:964 ../src/desktop.c:985
#: ../src/browser.c:184 ../src/desktop.c:972 ../src/desktop.c:993
msgid "Back"
msgstr ""
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:192 ../src/desktop.c:1046
#: ../src/browser.c:192 ../src/desktop.c:1054
msgid "Home"
msgstr ""
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:742 ../src/browser.c:746 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1647 ../src/desktop.c:1652 ../src/move.c:452
#: ../src/desktop.c:1655 ../src/desktop.c:1660 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:336 ../src/properties.c:340
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -206,7 +206,7 @@ msgstr ""
msgid "Shell scripts"
msgstr ""
#: ../src/browser.c:963 ../src/desktop.c:661 ../src/view.c:436
#: ../src/browser.c:963 ../src/desktop.c:669 ../src/view.c:436
msgid "All files"
msgstr ""
@ -335,7 +335,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr ""
#: ../src/callbacks.c:116 ../src/desktop.c:539
#: ../src/callbacks.c:116 ../src/desktop.c:547
msgid "New folder"
msgstr ""
@ -354,19 +354,19 @@ msgstr ""
msgid "New"
msgstr ""
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:450
#: ../src/callbacks.c:773 ../src/callbacks.c:777 ../src/desktop.c:458
msgid "Folder"
msgstr ""
#: ../src/callbacks.c:784 ../src/desktop.c:458
#: ../src/callbacks.c:784 ../src/desktop.c:466
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:788 ../src/desktop.c:462
#: ../src/callbacks.c:788 ../src/desktop.c:470
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:823 ../src/desktop.c:558
#: ../src/callbacks.c:823 ../src/desktop.c:566
msgid "New text file.txt"
msgstr ""
@ -415,7 +415,7 @@ msgstr ""
msgid "Copying: "
msgstr ""
#: ../src/copy.c:152 ../src/desktop.c:644
#: ../src/copy.c:152 ../src/desktop.c:652
msgid "Filename: "
msgstr ""
@ -500,59 +500,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:615
#: ../src/desktop.c:623
msgid "Desktop preferences"
msgstr ""
#: ../src/desktop.c:636
#: ../src/desktop.c:644
msgid "Default color: "
msgstr ""
#: ../src/desktop.c:648 ../src/desktop.c:686
#: ../src/desktop.c:656 ../src/desktop.c:694
msgid "Background"
msgstr ""
#: ../src/desktop.c:651
#: ../src/desktop.c:659
msgid "Picture files"
msgstr ""
#: ../src/desktop.c:669
#: ../src/desktop.c:677
msgid "Position: "
msgstr ""
#: ../src/desktop.c:675
#: ../src/desktop.c:683
msgid "Centered"
msgstr ""
#: ../src/desktop.c:677
#: ../src/desktop.c:685
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:679
#: ../src/desktop.c:687
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:681
#: ../src/desktop.c:689
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:692
#: ../src/desktop.c:700
msgid "Desktop font: "
msgstr ""
#: ../src/desktop.c:701
#: ../src/desktop.c:709
msgid "Theme"
msgstr ""
#: ../src/desktop.c:1077
#: ../src/desktop.c:1085
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1696
#: ../src/desktop.c:1704
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1801
#: ../src/desktop.c:1809
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

View File

@ -200,13 +200,11 @@ Desktop * desktop_new(DesktopPrefs * prefs)
screen = gdk_screen_get_default();
desktop->display = gdk_screen_get_display(screen);
desktop->root = gdk_screen_get_root_window(screen);
_desktop_get_workarea(desktop);
desktop->theme = gtk_icon_theme_get_default();
desktop->menu = NULL;
if((desktop->home = getenv("HOME")) == NULL
&& (desktop->home = g_get_home_dir()) == NULL)
desktop->home = "/";
desktop_set_layout(desktop, desktop->prefs.layout);
/* manage root window events */
gdk_add_client_message_filter(gdk_atom_intern(DESKTOP_CLIENT_MESSAGE,
FALSE), _on_root_event, desktop);
@ -217,7 +215,7 @@ Desktop * desktop_new(DesktopPrefs * prefs)
desktop->root) | GDK_BUTTON_PRESS_MASK
| GDK_PROPERTY_CHANGE_MASK);
gdk_window_add_filter(desktop->root, _on_root_event, desktop);
/* draw background when idle */
/* draw the icons and background when idle */
g_idle_add(_new_idle, desktop);
return desktop;
}
@ -228,6 +226,7 @@ static gboolean _new_idle(gpointer data)
Config * config;
char const * p;
size_t i;
char * q;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
@ -241,7 +240,16 @@ static gboolean _new_idle(gpointer data)
for(i = 0; i < desktop->icon_cnt; i++)
desktopicon_set_font(desktop->icon[i], desktop->font);
}
if(desktop->prefs.monitor < 0 && (p = config_get(config, NULL,
"monitor")) != NULL)
{
desktop->prefs.monitor = strtol(p, &q, 10);
if(p[0] == '\0' || *q != '\0')
desktop->prefs.monitor = -1;
}
config_delete(config);
_desktop_get_workarea(desktop);
desktop_set_layout(desktop, desktop->prefs.layout);
return FALSE;
}