Working on the default color selection

This commit is contained in:
Pierre Pronchery 2011-07-16 14:51:05 +00:00
parent 4e37c3f19a
commit fc9d440c1d
5 changed files with 109 additions and 94 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-07-16 16:04+0200\n"
"POT-Creation-Date: 2011-07-16 16:50+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:166 ../src/desktop.c:935 ../src/desktop.c:956
#: ../src/browser.c:166 ../src/desktop.c:950 ../src/desktop.c:971
msgid "Back"
msgstr "Zurück"
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:174 ../src/desktop.c:1017
#: ../src/browser.c:174 ../src/desktop.c:1032
msgid "Home"
msgstr "Persönlicher Ordner"
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:602 ../src/browser.c:607 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1618 ../src/desktop.c:1623 ../src/move.c:452
#: ../src/desktop.c:1633 ../src/desktop.c:1638 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -291,7 +291,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr "Aktualisierung..."
#: ../src/callbacks.c:116 ../src/desktop.c:536
#: ../src/callbacks.c:116 ../src/desktop.c:539
msgid "New folder"
msgstr "Neu Ordner"
@ -310,19 +310,19 @@ msgstr ""
msgid "New"
msgstr "Neu"
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:447
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:450
msgid "Folder"
msgstr "Ordner"
#: ../src/callbacks.c:783 ../src/desktop.c:455
#: ../src/callbacks.c:783 ../src/desktop.c:458
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:787 ../src/desktop.c:459
#: ../src/callbacks.c:787 ../src/desktop.c:462
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:822 ../src/desktop.c:555
#: ../src/callbacks.c:822 ../src/desktop.c:558
msgid "New text file.txt"
msgstr ""
@ -464,59 +464,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:613
#: ../src/desktop.c:616
msgid "Desktop preferences"
msgstr "Desktop Einstellungen"
#: ../src/desktop.c:634
#: ../src/desktop.c:637
msgid "Font: "
msgstr ""
#: ../src/desktop.c:644
#: ../src/desktop.c:647
msgid "Background: "
msgstr "Hintergrund: "
#: ../src/desktop.c:649
#: ../src/desktop.c:654
msgid "Background"
msgstr "Hintergrund"
#: ../src/desktop.c:652
#: ../src/desktop.c:657
msgid "Picture files"
msgstr ""
#: ../src/desktop.c:662
#: ../src/desktop.c:667
msgid "All files"
msgstr ""
#: ../src/desktop.c:670
#: ../src/desktop.c:675
msgid "Centered"
msgstr ""
#: ../src/desktop.c:672
#: ../src/desktop.c:677
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:674
#: ../src/desktop.c:679
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:676
#: ../src/desktop.c:681
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:682
#: ../src/desktop.c:687
msgid "Appearance"
msgstr ""
#: ../src/desktop.c:1048
#: ../src/desktop.c:1063
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1667
#: ../src/desktop.c:1682
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1772
#: ../src/desktop.c:1787
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-07-16 16:04+0200\n"
"POT-Creation-Date: 2011-07-16 16:50+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:166 ../src/desktop.c:935 ../src/desktop.c:956
#: ../src/browser.c:166 ../src/desktop.c:950 ../src/desktop.c:971
msgid "Back"
msgstr ""
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:174 ../src/desktop.c:1017
#: ../src/browser.c:174 ../src/desktop.c:1032
msgid "Home"
msgstr "Inicio"
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:602 ../src/browser.c:607 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1618 ../src/desktop.c:1623 ../src/move.c:452
#: ../src/desktop.c:1633 ../src/desktop.c:1638 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -291,7 +291,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr ""
#: ../src/callbacks.c:116 ../src/desktop.c:536
#: ../src/callbacks.c:116 ../src/desktop.c:539
msgid "New folder"
msgstr ""
@ -310,19 +310,19 @@ msgstr ""
msgid "New"
msgstr ""
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:447
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:450
msgid "Folder"
msgstr ""
#: ../src/callbacks.c:783 ../src/desktop.c:455
#: ../src/callbacks.c:783 ../src/desktop.c:458
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:787 ../src/desktop.c:459
#: ../src/callbacks.c:787 ../src/desktop.c:462
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:822 ../src/desktop.c:555
#: ../src/callbacks.c:822 ../src/desktop.c:558
msgid "New text file.txt"
msgstr ""
@ -464,59 +464,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:613
#: ../src/desktop.c:616
msgid "Desktop preferences"
msgstr "Desktop preferencias"
#: ../src/desktop.c:634
#: ../src/desktop.c:637
msgid "Font: "
msgstr ""
#: ../src/desktop.c:644
#: ../src/desktop.c:647
msgid "Background: "
msgstr ""
#: ../src/desktop.c:649
#: ../src/desktop.c:654
msgid "Background"
msgstr ""
#: ../src/desktop.c:652
#: ../src/desktop.c:657
msgid "Picture files"
msgstr ""
#: ../src/desktop.c:662
#: ../src/desktop.c:667
msgid "All files"
msgstr ""
#: ../src/desktop.c:670
#: ../src/desktop.c:675
msgid "Centered"
msgstr ""
#: ../src/desktop.c:672
#: ../src/desktop.c:677
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:674
#: ../src/desktop.c:679
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:676
#: ../src/desktop.c:681
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:682
#: ../src/desktop.c:687
msgid "Appearance"
msgstr ""
#: ../src/desktop.c:1048
#: ../src/desktop.c:1063
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1667
#: ../src/desktop.c:1682
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1772
#: ../src/desktop.c:1787
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-07-16 16:04+0200\n"
"POT-Creation-Date: 2011-07-16 16:50+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:166 ../src/desktop.c:935 ../src/desktop.c:956
#: ../src/browser.c:166 ../src/desktop.c:950 ../src/desktop.c:971
msgid "Back"
msgstr "Retour"
@ -129,7 +129,7 @@ msgstr "Suivant"
msgid "Refresh"
msgstr "Rafraîchir"
#: ../src/browser.c:174 ../src/desktop.c:1017
#: ../src/browser.c:174 ../src/desktop.c:1032
msgid "Home"
msgstr "Dossier personnel"
@ -187,7 +187,7 @@ msgstr " Chemin : "
#: ../src/browser.c:602 ../src/browser.c:607 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1618 ../src/desktop.c:1623 ../src/move.c:452
#: ../src/desktop.c:1633 ../src/desktop.c:1638 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -291,7 +291,7 @@ msgstr "Modifier avec :"
msgid "Refreshing folder..."
msgstr "Actualisation du dossier..."
#: ../src/callbacks.c:116 ../src/desktop.c:536
#: ../src/callbacks.c:116 ../src/desktop.c:539
msgid "New folder"
msgstr "Nouveau dossier"
@ -310,19 +310,19 @@ msgstr "Voulez-vous vraiment effacer %lu fichier(s)?"
msgid "New"
msgstr "Nouveau"
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:447
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:450
msgid "Folder"
msgstr "Dossier"
#: ../src/callbacks.c:783 ../src/desktop.c:455
#: ../src/callbacks.c:783 ../src/desktop.c:458
msgid "Symbolic link..."
msgstr "Lien symbolique..."
#: ../src/callbacks.c:787 ../src/desktop.c:459
#: ../src/callbacks.c:787 ../src/desktop.c:462
msgid "Text file"
msgstr "Fichier texte"
#: ../src/callbacks.c:822 ../src/desktop.c:555
#: ../src/callbacks.c:822 ../src/desktop.c:558
msgid "New text file.txt"
msgstr "Nouveau fichier texte.txt"
@ -484,59 +484,59 @@ msgstr ""
" -R\tSupprimer récursivement\n"
" -r\tÉquivalent à -R\n"
#: ../src/desktop.c:613
#: ../src/desktop.c:616
msgid "Desktop preferences"
msgstr "Préférences du bureau"
#: ../src/desktop.c:634
#: ../src/desktop.c:637
msgid "Font: "
msgstr "Fonte : "
#: ../src/desktop.c:644
#: ../src/desktop.c:647
msgid "Background: "
msgstr "Arrière-plan : "
#: ../src/desktop.c:649
#: ../src/desktop.c:654
msgid "Background"
msgstr "Arrière-plan"
#: ../src/desktop.c:652
#: ../src/desktop.c:657
msgid "Picture files"
msgstr "Images"
#: ../src/desktop.c:662
#: ../src/desktop.c:667
msgid "All files"
msgstr "Tous les fichiers"
#: ../src/desktop.c:670
#: ../src/desktop.c:675
msgid "Centered"
msgstr ""
#: ../src/desktop.c:672
#: ../src/desktop.c:677
msgid "Scaled"
msgstr "Étiré"
#: ../src/desktop.c:674
#: ../src/desktop.c:679
msgid "Scaled (keep ratio)"
msgstr "Étiré (sans déformer)"
#: ../src/desktop.c:676
#: ../src/desktop.c:681
msgid "Tiled"
msgstr "Mosaïque"
#: ../src/desktop.c:682
#: ../src/desktop.c:687
msgid "Appearance"
msgstr "Apparence"
#: ../src/desktop.c:1048
#: ../src/desktop.c:1063
msgid "Applications"
msgstr "Applications"
#: ../src/desktop.c:1667
#: ../src/desktop.c:1682
msgid "Could not load preferences"
msgstr "Impossible de charger les préférences"
#: ../src/desktop.c:1772
#: ../src/desktop.c:1787
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-07-16 16:04+0200\n"
"POT-Creation-Date: 2011-07-16 16:50+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:166 ../src/desktop.c:935 ../src/desktop.c:956
#: ../src/browser.c:166 ../src/desktop.c:950 ../src/desktop.c:971
msgid "Back"
msgstr ""
@ -129,7 +129,7 @@ msgstr ""
msgid "Refresh"
msgstr ""
#: ../src/browser.c:174 ../src/desktop.c:1017
#: ../src/browser.c:174 ../src/desktop.c:1032
msgid "Home"
msgstr ""
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:602 ../src/browser.c:607 ../src/copy.c:674
#: ../src/copy.c:678 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1618 ../src/desktop.c:1623 ../src/move.c:452
#: ../src/desktop.c:1633 ../src/desktop.c:1638 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:367 ../src/view.c:372
msgid "Error"
@ -291,7 +291,7 @@ msgstr ""
msgid "Refreshing folder..."
msgstr ""
#: ../src/callbacks.c:116 ../src/desktop.c:536
#: ../src/callbacks.c:116 ../src/desktop.c:539
msgid "New folder"
msgstr ""
@ -310,19 +310,19 @@ msgstr ""
msgid "New"
msgstr ""
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:447
#: ../src/callbacks.c:772 ../src/callbacks.c:776 ../src/desktop.c:450
msgid "Folder"
msgstr ""
#: ../src/callbacks.c:783 ../src/desktop.c:455
#: ../src/callbacks.c:783 ../src/desktop.c:458
msgid "Symbolic link..."
msgstr ""
#: ../src/callbacks.c:787 ../src/desktop.c:459
#: ../src/callbacks.c:787 ../src/desktop.c:462
msgid "Text file"
msgstr ""
#: ../src/callbacks.c:822 ../src/desktop.c:555
#: ../src/callbacks.c:822 ../src/desktop.c:558
msgid "New text file.txt"
msgstr ""
@ -464,59 +464,59 @@ msgid ""
" -r\tEquivalent to -R\n"
msgstr ""
#: ../src/desktop.c:613
#: ../src/desktop.c:616
msgid "Desktop preferences"
msgstr ""
#: ../src/desktop.c:634
#: ../src/desktop.c:637
msgid "Font: "
msgstr ""
#: ../src/desktop.c:644
#: ../src/desktop.c:647
msgid "Background: "
msgstr ""
#: ../src/desktop.c:649
#: ../src/desktop.c:654
msgid "Background"
msgstr ""
#: ../src/desktop.c:652
#: ../src/desktop.c:657
msgid "Picture files"
msgstr ""
#: ../src/desktop.c:662
#: ../src/desktop.c:667
msgid "All files"
msgstr ""
#: ../src/desktop.c:670
#: ../src/desktop.c:675
msgid "Centered"
msgstr ""
#: ../src/desktop.c:672
#: ../src/desktop.c:677
msgid "Scaled"
msgstr ""
#: ../src/desktop.c:674
#: ../src/desktop.c:679
msgid "Scaled (keep ratio)"
msgstr ""
#: ../src/desktop.c:676
#: ../src/desktop.c:681
msgid "Tiled"
msgstr ""
#: ../src/desktop.c:682
#: ../src/desktop.c:687
msgid "Appearance"
msgstr ""
#: ../src/desktop.c:1048
#: ../src/desktop.c:1063
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1667
#: ../src/desktop.c:1682
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1772
#: ../src/desktop.c:1787
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

View File

@ -92,6 +92,7 @@ struct _Desktop
/* preferences */
GtkWidget * pr_window;
GtkWidget * pr_font;
GtkWidget * pr_color;
GtkWidget * pr_background;
GtkWidget * pr_background_how;
@ -247,7 +248,7 @@ static gboolean _new_idle(gpointer data)
static void _idle_background(Desktop * desktop, Config * config)
{
GdkGC * gc;
GdkColor black = { 0, 0, 0, 0 };
GdkColor color = { 0, 0, 0, 0 };
char const * filename;
char const * p;
DesktopHows how = DESKTOP_HOW_SCALED;
@ -259,7 +260,9 @@ static void _idle_background(Desktop * desktop, Config * config)
pixmap = gdk_pixmap_new(desktop->root, desktop->window.width,
desktop->window.height, -1);
gc = gdk_gc_new(pixmap);
gdk_gc_set_foreground(gc, &black);
if((p = config_get(config, NULL, "background_color")) != NULL)
gdk_color_parse(p, &color);
gdk_gc_set_foreground(gc, &color);
gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, desktop->window.width,
desktop->window.height);
/* open background file */
@ -646,6 +649,8 @@ static void _on_popup_preferences(gpointer data)
gtk_size_group_add_widget(group, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
vbox3 = gtk_vbox_new(FALSE, 4);
desktop->pr_color = gtk_color_button_new();
gtk_box_pack_start(GTK_BOX(vbox3), desktop->pr_color, TRUE, TRUE, 0);
desktop->pr_background = gtk_file_chooser_button_new(_("Background"),
GTK_FILE_CHOOSER_ACTION_OPEN);
filter = gtk_file_filter_new();
@ -715,6 +720,7 @@ static void _on_preferences_apply(gpointer data)
{
Desktop * desktop = data;
Config * config;
GdkColor color;
char * p;
char const * q;
int i;
@ -729,6 +735,10 @@ static void _on_preferences_apply(gpointer data)
desktop->pr_background));
config_set(config, NULL, "background", p);
g_free(p);
gtk_color_button_get_color(GTK_COLOR_BUTTON(desktop->pr_color), &color);
p = gdk_color_to_string(&color);
config_set(config, NULL, "background_color", p);
g_free(p);
i = gtk_combo_box_get_active(GTK_COMBO_BOX(desktop->pr_background_how));
if(i >= 0 && i < DESKTOP_HOW_COUNT)
config_set(config, NULL, "background_how", _desktop_hows[i]);
@ -754,6 +764,7 @@ static void _preferences_set(Desktop * desktop)
Config * config;
String const * p;
String const * filename = NULL;
GdkColor color = { 0, 0, 0, 0, 0 };
int how = 0;
size_t i;
@ -763,6 +774,10 @@ static void _preferences_set(Desktop * desktop)
gtk_font_button_set_font_name(GTK_FONT_BUTTON(
desktop->pr_font), p);
filename = config_get(config, NULL, "background");
if((p = config_get(config, NULL, "background_color")) != NULL
&& gdk_color_parse(p, &color) == TRUE)
gtk_color_button_set_color(GTK_COLOR_BUTTON(
desktop->pr_color), &color);
if((p = config_get(config, NULL, "background_how")) != NULL)
for(i = 0; i < DESKTOP_HOW_COUNT; i++)
if(strcmp(_desktop_hows[i], p) == 0)