From 1c1cfea95e549170ede1eaf05240b935aa2186a9 Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Tue, 2 Nov 2010 11:40:50 +0000 Subject: [PATCH] update my contribution to the company --- AUTHORS | 2 +- src/clock/clock.c | 2 +- src/config.c | 2 +- src/launcher/launcher.c | 6 +- src/panel.c | 2 +- src/systray/systraybar.c | 2 +- src/taskbar/task.c | 2 +- src/taskbar/taskbar.c | 2 +- src/taskbar/taskbarname.c | 2 +- src/tint.c | 2 +- src/tint2conf/main.c | 9 +- src/tint2conf/properties.c | 598 +++++++++++++++++++++++-------------- src/tint2conf/theme_view.c | 18 ++ src/util/area.c | 2 +- src/util/common.c | 2 +- src/util/window.c | 2 +- 16 files changed, 418 insertions(+), 237 deletions(-) diff --git a/AUTHORS b/AUTHORS index c8f91f4..da54861 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ tint2 is developped by : -- Thierry Lorthiois +- Thierry Lorthiois from Omega distribution - Andreas Fink - Euan Freeman (tintwizard) - Christian Ruppert (autotools build system) diff --git a/src/clock/clock.c b/src/clock/clock.c index 500cfa3..9237861 100644 --- a/src/clock/clock.c +++ b/src/clock/clock.c @@ -2,7 +2,7 @@ * * Tint2 : clock * -* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/config.c b/src/config.c index 2ff77f5..7c87339 100644 --- a/src/config.c +++ b/src/config.c @@ -3,7 +3,7 @@ * Tint2 : read/write config file * * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 54b6639..e0266d1 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -177,7 +177,7 @@ int resize_launcher(void *obj) new_icon_path = icon_path(launcher, ICON_FALLBACK, launcherIcon->icon_size); if (new_icon_path) { launcherIcon->icon_original = imlib_load_image(new_icon_path); - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, new_icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, new_icon_path); free(new_icon_path); } launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size); @@ -188,7 +188,7 @@ int resize_launcher(void *obj) free_icon(launcherIcon->icon_scaled); launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size); free(new_icon_path); - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, launcherIcon->icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path); } else { // Free the old files free_icon(launcherIcon->icon_original); @@ -198,7 +198,7 @@ int resize_launcher(void *obj) launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size); free(launcherIcon->icon_path); launcherIcon->icon_path = new_icon_path; - fprintf(stderr, "%s %d: Using icon %s\n", __FILE__, __LINE__, launcherIcon->icon_path); + fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path); } } } diff --git a/src/panel.c b/src/panel.c index 3971bc8..fce1277 100644 --- a/src/panel.c +++ b/src/panel.c @@ -1,7 +1,7 @@ /************************************************************************** * * Copyright (C) 2008 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index 8a840ce..abf633e 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -1,7 +1,7 @@ /************************************************************************** * Tint2 : systraybar * -* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * based on 'docker-1.5' from Ben Jansens. * * This program is free software; you can redistribute it and/or diff --git a/src/taskbar/task.c b/src/taskbar/task.c index bdc0fde..dec695f 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -3,7 +3,7 @@ * Tint2 : task * * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index 2c5b748..59ff52b 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -2,7 +2,7 @@ * * Tint2 : taskbar * -* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/taskbar/taskbarname.c b/src/taskbar/taskbarname.c index ea5c0db..7d71629 100644 --- a/src/taskbar/taskbarname.c +++ b/src/taskbar/taskbarname.c @@ -2,7 +2,7 @@ * * Tint2 : taskbarname * -* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/tint.c b/src/tint.c index 47bce1b..1772681 100644 --- a/src/tint.c +++ b/src/tint.c @@ -3,7 +3,7 @@ * Tint2 panel * * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 0fcfe4c..66ac917 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -2,7 +2,7 @@ * * Tint2conf * -* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -164,10 +164,6 @@ int main (int argc, char ** argv) // load themes load_theme(g_theme_view); - /* temporaire !!!!!!!!!!!!!! - GtkWidget *prop = create_properties(); - gtk_window_present(GTK_WINDOW(prop)); - //*/ gtk_widget_show_all(g_window); gtk_main (); return 0; @@ -340,11 +336,12 @@ static void menuProperties() gtk_window_present(GTK_WINDOW(prop)); //printf("menuProperties : fin\n"); //*/ - +//* cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file); printf("cmd %s\n", cmd); system(cmd); g_free(cmd); + //*/ g_free(file); } diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index 8bdb9d8..a70a730 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -1,3 +1,21 @@ +/************************************************************************** +* +* Tint2conf +* +* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**************************************************************************/ #include "main.h" #include "properties.h" @@ -22,7 +40,7 @@ GtkWidget *create_properties() { GtkWidget *view, *dialog_vbox3, *button, *notebook; GtkTooltips *tooltips; - GtkWidget *page_panel, *page_taskbar, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_task, *page_background; + GtkWidget *page_panel, *page_launcher, *page_taskbar, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_task, *page_background; GtkWidget *label; tooltips = gtk_tooltips_new (); @@ -59,15 +77,6 @@ GtkWidget *create_properties() GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); // notebook - /* - label = gtk_label_new (_("General")); - gtk_widget_show (label); - page_general = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); - gtk_container_set_border_width(GTK_CONTAINER(page_general), 10); - gtk_widget_show (page_general); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_general, label); - create_general(page_general); -*/ label = gtk_label_new (_("Panel")); gtk_widget_show (label); page_panel = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); @@ -76,6 +85,14 @@ GtkWidget *create_properties() gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_panel, label); create_panel(page_panel); + label = gtk_label_new (_("Launcher")); + gtk_widget_show (label); + page_launcher = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_launcher), 10); + gtk_widget_show (page_launcher); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_launcher, label); + create_launcher(page_launcher); + label = gtk_label_new (_("Taskbar")); gtk_widget_show (label); page_taskbar = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); @@ -132,7 +149,6 @@ GtkWidget *create_properties() gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_background, label); create_background(page_background); -printf("create_properties : fin\n"); return view; } @@ -147,112 +163,125 @@ void change_paragraph(GtkWidget *widget) } -void create_general(GtkWidget *parent) -{ -} - - void create_panel(GtkWidget *parent) { int i; GtkWidget *screen_position[12]; GtkWidget *table, *hbox, *frame; - GtkWidget *margin_x, *margin_y, *combo_strut_policy, *combo_layer, *combo_width_type, *combo_height_type, *combo_monitor, *combo_background; + GtkWidget *margin_x, *margin_y, *combo_strut_policy, *combo_layer, *combo_width_type, *combo_height_type, *combo_monitor, *combo_background, *items_order; GtkWidget *label; - label = gtk_label_new (_("Position and size")); + label = gtk_label_new (_("Position, size and items order")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 20); - gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (parent), hbox, FALSE, FALSE, 0); - - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 20); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (parent), hbox, FALSE, FALSE, 0); + + // left marging + table = gtk_table_new (2, 1, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); + gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); + + table = gtk_table_new (5, 5, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); + for (i = 0; i < 12; ++i) { + screen_position[i] = gtk_toggle_button_new (); + gtk_widget_show (screen_position[i]); + + if (i <= 2 || i >= 9) + gtk_widget_set_size_request (screen_position[i], 30, 15); + else + gtk_widget_set_size_request (screen_position[i], 15, 25); + +// g_signal_connect (G_OBJECT (screen_position[i]), "button-press-event", G_CALLBACK (screen_position_pressed)); +// g_signal_connect (G_OBJECT (screen_position[i]), "key-press-event", G_CALLBACK (screen_position_pressed)); + } + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[0], 1, 2, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[1], 2, 3, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[2], 3, 4, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[3], 0, 1, 1, 2); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[4], 0, 1, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[5], 0, 1, 3, 4); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[6], 4, 5, 1, 2); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[7], 4, 5, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[8], 4, 5, 3, 4); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[9], 1, 2, 4, 5); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[10], 2, 3, 4, 5); + gtk_table_attach_defaults (GTK_TABLE (table), screen_position[11], 3, 4, 4, 5); + + table = gtk_table_new (3, 8, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); label = gtk_label_new (_("Width")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); margin_x = gtk_spin_button_new_with_range (0, 9000, 1); gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), margin_x, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); combo_width_type = gtk_combo_box_new_text (); gtk_widget_show (combo_width_type); - gtk_table_attach (GTK_TABLE (table), combo_width_type, 4, 5, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), combo_width_type, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_width_type), _("Percent")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_width_type), _("Pixels")); label = gtk_label_new (_("Marging x")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); margin_x = gtk_spin_button_new_with_range (0, 500, 1); gtk_widget_show (margin_x); gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); - gtk_table_attach (GTK_TABLE (table), margin_x, 8, 9, 0, 1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); label = gtk_label_new (_("Height")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); margin_y = gtk_spin_button_new_with_range (0, 9000, 1); gtk_widget_show (margin_y); - gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), margin_y, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Items order")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0); + + items_order = gtk_entry_new (); + gtk_widget_show (items_order); + gtk_entry_set_width_chars (GTK_ENTRY (items_order), 15); + gtk_table_attach (GTK_TABLE (table), items_order, 2, 4, 2, 3, GTK_FILL, 0, 0, 0); + + change_paragraph(parent); combo_height_type = gtk_combo_box_new_text (); gtk_widget_show (combo_height_type); - gtk_table_attach (GTK_TABLE (table), combo_height_type, 4, 5, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), combo_height_type, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_height_type), _("Percent")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_height_type), _("Pixels")); label = gtk_label_new (_("Marging y")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); margin_y = gtk_spin_button_new_with_range (0, 500, 1); gtk_widget_show (margin_y); gtk_entry_set_max_length (GTK_ENTRY (margin_y), 3); - gtk_table_attach (GTK_TABLE (table), margin_y, 8, 9, 1, 2, GTK_FILL, 0, 0, 0); - - table = gtk_table_new (5, 5, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); - - for (i = 0; i < 12; ++i) { - screen_position[i] = gtk_toggle_button_new (); - gtk_widget_show (screen_position[i]); - - if (i <= 2 || i >= 9) - gtk_widget_set_size_request (screen_position[i], 30, 15); - else - gtk_widget_set_size_request (screen_position[i], 15, 25); - -// g_signal_connect (G_OBJECT (screen_position[i]), "button-press-event", G_CALLBACK (screen_position_pressed)); -// g_signal_connect (G_OBJECT (screen_position[i]), "key-press-event", G_CALLBACK (screen_position_pressed)); - } - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[0], 1, 2, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[1], 2, 3, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[2], 3, 4, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[3], 0, 1, 1, 2); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[4], 0, 1, 2, 3); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[5], 0, 1, 3, 4); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[6], 4, 5, 1, 2); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[7], 4, 5, 2, 3); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[8], 4, 5, 3, 4); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[9], 1, 2, 4, 5); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[10], 2, 3, 4, 5); - gtk_table_attach_defaults (GTK_TABLE (table), screen_position[11], 3, 4, 4, 5); + gtk_table_attach (GTK_TABLE (table), margin_y, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); frame = gtk_frame_new (NULL); gtk_widget_show (frame); @@ -265,9 +294,9 @@ void create_panel(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -326,13 +355,13 @@ void create_panel(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -354,7 +383,7 @@ void create_panel(GtkWidget *parent) gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -382,9 +411,9 @@ void create_panel(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 12, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 12, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -417,9 +446,9 @@ void create_panel(GtkWidget *parent) gtk_widget_show (combo_layer); gtk_entry_set_max_length (GTK_ENTRY (combo_layer), 3); gtk_table_attach (GTK_TABLE (table), combo_layer, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("Top")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("Normal")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("Bottom")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("top")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("normal")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_layer), _("bottom")); label = gtk_label_new (_("Strut policy")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -430,9 +459,9 @@ void create_panel(GtkWidget *parent) gtk_widget_show (combo_strut_policy); gtk_entry_set_max_length (GTK_ENTRY (combo_strut_policy), 3); gtk_table_attach (GTK_TABLE (table), combo_strut_policy, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("Follow size")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("Minimum")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("None")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("follow_size")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("minimum")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_strut_policy), _("none")); label = gtk_label_new (_("Monitor")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -448,14 +477,107 @@ void create_panel(GtkWidget *parent) } +void create_launcher(GtkWidget *parent) +{ + GtkWidget *table, *label; + GtkWidget *margin_x, *margin_y, *combo_background; + + label = gtk_label_new (_("Applications")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_widget_show (label); + gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); + + change_paragraph(parent); + + label = gtk_label_new (_("Appearance")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_widget_show (label); + gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); + + table = gtk_table_new (6, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); + gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); + + label = gtk_label_new (_("Horizontal padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); + + margin_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_x); + gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); + gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Vertical padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); + + margin_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_y); + gtk_entry_set_max_length (GTK_ENTRY (margin_y), 3); + gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Spacing")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_FILL, 0, 0, 0); + + margin_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_x); + gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); + gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Background")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); + + combo_background = gtk_combo_box_new_text (); + gtk_widget_show (combo_background); + gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + + label = gtk_label_new (_("Icon size")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); + + margin_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_x); + gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); + gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Icon theme")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 2, 3, GTK_FILL, 0, 0, 0); + + combo_background = gtk_combo_box_new_text (); + gtk_widget_show (combo_background); + gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 2, 3, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Theme 3")); + + change_paragraph(parent); +} + + void create_taskbar(GtkWidget *parent) { GtkWidget *table, *label; GtkWidget *margin_x, *margin_y, *combo_background; - table = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -469,6 +591,16 @@ void create_taskbar(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); + label = gtk_label_new (_("Show taskbar name")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); + + margin_x = gtk_check_button_new (); + gtk_widget_show (margin_x); + gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); + gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); + change_paragraph(parent); label = gtk_label_new (_("Appearance")); @@ -477,13 +609,13 @@ void create_taskbar(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 12, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (3, 12, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -493,7 +625,7 @@ void create_taskbar(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -513,7 +645,65 @@ void create_taskbar(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Background active")); + label = gtk_label_new (_("Normal background")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); + + combo_background = gtk_combo_box_new_text (); + gtk_widget_show (combo_background); + gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + + label = gtk_label_new (_("Active background")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); + + combo_background = gtk_combo_box_new_text (); + gtk_widget_show (combo_background); + gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 1")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); + + change_paragraph(parent); + + label = gtk_label_new (_("Name appearance")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_widget_show (label); + gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); + + table = gtk_table_new (2, 12, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); + gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); + + label = gtk_label_new (_("Horizontal padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); + + margin_x = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_x); + gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); + gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Vertical padding")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_widget_show (label); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); + + margin_y = gtk_spin_button_new_with_range (0, 500, 1); + gtk_widget_show (margin_y); + gtk_entry_set_max_length (GTK_ENTRY (margin_y), 3); + gtk_table_attach (GTK_TABLE (table), margin_y, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Normal background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 0, 1, GTK_FILL, 0, 0, 0); @@ -525,7 +715,7 @@ void create_taskbar(GtkWidget *parent) gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 2")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Back 3")); - label = gtk_label_new (_("Background inactive")); + label = gtk_label_new (_("Active background")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0); @@ -552,9 +742,9 @@ void create_task(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -566,16 +756,17 @@ void create_task(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("None")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Maximize restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Desktop left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Next task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Previous task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); label = gtk_label_new (_("Wheel scroll up")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -585,16 +776,17 @@ void create_task(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("None")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Maximize restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Desktop left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Next task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Previous task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); label = gtk_label_new (_("Right click")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -604,16 +796,17 @@ void create_task(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("None")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Maximize restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Desktop left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Next task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Previous task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); label = gtk_label_new (_("Wheel scroll down")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); @@ -623,16 +816,17 @@ void create_task(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("None")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Close")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Shade")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Toggle iconify")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Maximize restore")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Desktop left")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Next task")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Previous task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("none")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("close")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("shade")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("toggle_iconify")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("maximize_restore")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("desktop_right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("next_task")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("previous_task")); change_paragraph(parent); @@ -642,9 +836,9 @@ void create_task(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (4, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (4, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -731,31 +925,22 @@ void create_clock(GtkWidget *parent) GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; - table = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (1, 2, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Show clock")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - - change_paragraph(parent); +// change_paragraph(parent); label = gtk_label_new (_("Format and timezone")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (3, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (3, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -827,9 +1012,9 @@ void create_clock(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -861,13 +1046,13 @@ void create_clock(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (3, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (3, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -877,7 +1062,7 @@ void create_clock(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -939,21 +1124,12 @@ void create_systemtray(GtkWidget *parent) GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; - table = gtk_table_new (2, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Show notification")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Icon ordering")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); @@ -962,10 +1138,10 @@ void create_systemtray(GtkWidget *parent) combo_background = gtk_combo_box_new_text (); gtk_widget_show (combo_background); gtk_table_attach (GTK_TABLE (table), combo_background, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Ascending")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Descending")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Left to right")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("Right to left")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("ascending")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("descending")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("left2right")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("right2left")); change_paragraph(parent); @@ -975,13 +1151,13 @@ void create_systemtray(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (6, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (6, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -991,7 +1167,7 @@ void create_systemtray(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -1072,32 +1248,21 @@ void create_battery(GtkWidget *parent) GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; - table = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (1, 2, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Show battery")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - - margin_x = gtk_check_button_new (); - gtk_widget_show (margin_x); - gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); - - change_paragraph(parent); - label = gtk_label_new (_("Event")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -1139,13 +1304,13 @@ void create_battery(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (4, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (4, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -1155,7 +1320,7 @@ void create_battery(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -1217,9 +1382,9 @@ void create_tooltip(GtkWidget *parent) GtkWidget *margin_x, *margin_y, *combo_background; GtkWidget *label; - table = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (1, 2, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -1240,9 +1405,9 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (2, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); @@ -1282,13 +1447,13 @@ void create_tooltip(GtkWidget *parent) gtk_widget_show (label); gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0); - table = gtk_table_new (3, 10, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); + table = gtk_table_new (3, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (parent), table, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING); gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING); - label = gtk_label_new (_("Padding horizontal")); + label = gtk_label_new (_("Horizontal padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); @@ -1298,7 +1463,7 @@ void create_tooltip(GtkWidget *parent) gtk_entry_set_max_length (GTK_ENTRY (margin_x), 3); gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); - label = gtk_label_new (_("Padding vertical")); + label = gtk_label_new (_("Vertical padding")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); @@ -1341,11 +1506,12 @@ void create_tooltip(GtkWidget *parent) gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); change_paragraph(parent); - } void create_background(GtkWidget *parent) { + + change_paragraph(parent); } diff --git a/src/tint2conf/theme_view.c b/src/tint2conf/theme_view.c index b86c9ec..5fd9187 100644 --- a/src/tint2conf/theme_view.c +++ b/src/tint2conf/theme_view.c @@ -1,3 +1,21 @@ +/************************************************************************** +* +* Tint2conf +* +* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +**************************************************************************/ #include "main.h" diff --git a/src/util/area.c b/src/util/area.c index 9b70b12..64441b5 100644 --- a/src/util/area.c +++ b/src/util/area.c @@ -2,7 +2,7 @@ * * Tint2 : area * -* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/util/common.c b/src/util/common.c index 629d29c..b9f2b72 100644 --- a/src/util/common.c +++ b/src/util/common.c @@ -3,7 +3,7 @@ * Tint2 : common windows function * * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 diff --git a/src/util/window.c b/src/util/window.c index 0466236..ef38071 100644 --- a/src/util/window.c +++ b/src/util/window.c @@ -3,7 +3,7 @@ * Tint2 : common windows function * * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 -- 2.45.2