X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fproperties.c;h=82a30750e95952624d7d08f547782c2d17d0a6ff;hb=221d2c2ed532ee90afc81a1053144b6336f97d95;hp=303a40c633532cf23d263290c6866b8d51295b5d;hpb=b079f35351d4dbe5e4bb23bccc1c4338b2f538e3;p=chaz%2Ftint2
diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c
index 303a40c..82a3075 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"
@@ -9,6 +27,7 @@
void change_paragraph(GtkWidget *widget);
void create_general(GtkWidget *parent);
void create_panel(GtkWidget *parent);
+void create_launcher(GtkWidget *parent);
void create_taskbar(GtkWidget *parent);
void create_task(GtkWidget *parent);
void create_clock(GtkWidget *parent);
@@ -22,14 +41,14 @@ 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 ();
// global layer
view = gtk_dialog_new ();
- gtk_window_set_title (GTK_WINDOW (view), _("Preferences"));
+ gtk_window_set_title (GTK_WINDOW (view), _("Properties"));
gtk_window_set_modal (GTK_WINDOW (view), TRUE);
gtk_window_set_skip_pager_hint (GTK_WINDOW (view), TRUE);
gtk_window_set_type_hint (GTK_WINDOW (view), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -59,15 +78,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 +86,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 +150,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,88 +164,33 @@ 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);
- 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);
-
- 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);
-
- 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_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);
-
- 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);
-
- 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);
-
- 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);
-
- 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_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);
-
- 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);
-
+ 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]);
@@ -254,66 +216,78 @@ void create_panel(GtkWidget *parent)
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);
- frame = gtk_frame_new (NULL);
- gtk_widget_show (frame);
- gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+ 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 (_("Appearance"));
+ label = gtk_label_new (_("Width"));
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);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 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);
+ margin_x = gtk_spin_button_new_with_range (0, 9000, 1);
+ gtk_widget_show (margin_x);
+ 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, 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 (_("Padding horizontal"));
+ 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, 2, 3, 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, 3, 4, 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 (_("Background"));
+ 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, 6, 7, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, 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, 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"));
+ margin_y = gtk_spin_button_new_with_range (0, 9000, 1);
+ gtk_widget_show (margin_y);
+ gtk_table_attach (GTK_TABLE (table), margin_y, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
- label = gtk_label_new (_("Padding vertical"));
+ 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, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, 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);
+ 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);
- label = gtk_label_new (_("Spacing"));
+ 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, 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, 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);
+ 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, 7, 8, 1, 2, GTK_FILL, 0, 0, 0);
- change_paragraph(parent);
+ frame = gtk_frame_new (NULL);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
label = gtk_label_new (_("Autohide"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
@@ -321,9 +295,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);
@@ -350,7 +324,7 @@ void create_panel(GtkWidget *parent)
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 8, 9, 0, 1, GTK_FILL, 0, 0, 0);
- label = gtk_label_new (_("Hidden height"));
+ label = gtk_label_new (_("Hidden size"));
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);
@@ -376,15 +350,71 @@ void create_panel(GtkWidget *parent)
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 (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 (_("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 (_("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 (_("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, 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);
+
+ change_paragraph(parent);
+
label = gtk_label_new (_("Window manager"));
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);
+ 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 +447,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 +460,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,26 +478,16 @@ void create_panel(GtkWidget *parent)
}
-void create_taskbar(GtkWidget *parent)
+void create_launcher(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);
- 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 all desktop"));
+ 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_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_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);
+ gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0);
change_paragraph(parent);
@@ -477,13 +497,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 (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);
@@ -493,146 +513,321 @@ 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 (_("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, 6, 7, 0, 1, GTK_FILL, 0, 0, 0);
+ 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, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0);
- label = gtk_label_new (_("Background inactive"));
+ 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, 10, 11, 0, 1, GTK_FILL, 0, 0, 0);
+ 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, 11, 12, 0, 1, GTK_FILL, 0, 0, 0);
+ 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 (_("Padding vertical"));
+ 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, 2, 3, 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, 3, 4, 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 (_("Background active"));
+ 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, 10, 11, 1, 2, GTK_FILL, 0, 0, 0);
+ 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, 11, 12, 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"));
+ 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_task(GtkWidget *parent)
+void create_taskbar(GtkWidget *parent)
{
- GtkWidget *table, *label, *notebook, *page_task;
- GtkWidget *margin_x, *combo_background;
-
- label = gtk_label_new (_("Mouse action"));
- 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);
+ GtkWidget *table, *label;
+ GtkWidget *margin_x, *margin_y, *combo_background;
- 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, 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 (_("Middle click"));
+ label = gtk_label_new (_("Show all desktop"));
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, 0, 1, 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, 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"));
+ 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, 0, 1, GTK_FILL, 0, 0, 0);
- label = gtk_label_new (_("Wheel scroll up"));
+ 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, 6, 7, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 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, 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"));
+ 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);
- label = gtk_label_new (_("Right click"));
+ 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_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start(GTK_BOX (parent), label, FALSE, FALSE, 0);
- 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"));
+ 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 (_("Wheel scroll down"));
+ 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, 6, 7, 1, 2, GTK_FILL, 0, 0, 0);
+ 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 (_("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);
+
+ 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);
+}
+
+
+void create_task(GtkWidget *parent)
+{
+ GtkWidget *table, *label, *notebook, *page_task;
+ GtkWidget *margin_x, *combo_background;
+
+ label = gtk_label_new (_("Mouse action"));
+ 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);
+ gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING);
+ gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING);
+
+ label = gtk_label_new (_("Middle click"));
+ 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);
+
+ 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), _("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);
+ 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), _("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);
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 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, 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), _("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);
+ 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), _("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 +837,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,27 +926,84 @@ 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"));
+// 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);
+ gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING);
+ gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING);
+
+ label = gtk_label_new (_("First line"));
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);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
- margin_x = gtk_check_button_new ();
+ margin_x = gtk_entry_new ();
gtk_widget_show (margin_x);
- gtk_table_attach (GTK_TABLE (table), margin_x, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
- change_paragraph(parent);
+ label = gtk_label_new (_("Second line"));
+ 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);
- label = gtk_label_new (_("Format and timezone"));
+ margin_x = gtk_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Tooltip"));
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);
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_FILL, 0, 0, 0);
+
+ margin_x = gtk_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 15);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("First line"));
+ 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);
+
+ margin_x = gtk_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Second line"));
+ 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_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Tooltip"));
+ 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);
+
+ margin_x = gtk_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 20);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 2, 3, GTK_FILL, 0, 0, 0);
change_paragraph(parent);
@@ -761,6 +1013,32 @@ 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);
+ gtk_table_set_row_spacings (GTK_TABLE (table), ROW_SPACING);
+ gtk_table_set_col_spacings (GTK_TABLE (table), COL_SPACING);
+
+ label = gtk_label_new (_("Left click command"));
+ 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_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 12);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Right click command"));
+ 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);
+
+ margin_x = gtk_entry_new ();
+ gtk_widget_show (margin_x);
+ gtk_entry_set_width_chars (GTK_ENTRY (margin_x), 12);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+
change_paragraph(parent);
label = gtk_label_new (_("Appearance"));
@@ -769,13 +1047,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);
@@ -785,46 +1063,56 @@ 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 (_("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 (_("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);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 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, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, 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 (_("Padding vertical"));
+ label = gtk_label_new (_("Font first line"));
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, 6, 7, 0, 1, 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);
+ margin_x = gtk_font_button_new ();
+ gtk_widget_show (margin_x);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE);
- label = gtk_label_new (_("Font color"));
+ label = gtk_label_new (_("Font second line"));
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);
+ gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0);
- margin_x = gtk_color_button_new();
- gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE);
+ margin_x = gtk_font_button_new ();
gtk_widget_show (margin_x);
- gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0);
+// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE);
- label = gtk_label_new (_("Font"));
+ label = gtk_label_new (_("Font color"));
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);
- margin_x = gtk_spin_button_new_with_range (0, 500, 1);
+ margin_x = gtk_color_button_new();
+ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE);
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, 2, 3, GTK_FILL, 0, 0, 0);
change_paragraph(parent);
@@ -834,26 +1122,124 @@ void create_clock(GtkWidget *parent)
void create_systemtray(GtkWidget *parent)
{
GtkWidget *table;
- GtkWidget *margin_x;
+ 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 (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"));
+ label = gtk_label_new (_("Icon ordering"));
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);
+ 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_table_attach (GTK_TABLE (table), margin_x, 1, 2, 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, 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), _("left2right"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_background), _("right2left"));
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, 2, 3, 3, 4, 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, 3, 4, 3, 4, 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, 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, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Icon opacity"));
+ 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, 100, 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 saturation"));
+ 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);
+
+ margin_x = gtk_spin_button_new_with_range (-100, 100, 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, 2, 3, GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new (_("Icon brightness"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table), label, 6, 7, 3, 4, GTK_FILL, 0, 0, 0);
+
+ margin_x = gtk_spin_button_new_with_range (-100, 100, 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, 3, 4, GTK_FILL, 0, 0, 0);
+
}
@@ -863,32 +1249,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);
@@ -930,13 +1305,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);
@@ -946,57 +1321,57 @@ 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 (_("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 (_("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);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 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, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, 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 (_("Padding vertical"));
+ label = gtk_label_new (_("Font first line"));
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, 6, 7, 0, 1, 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);
+ margin_x = gtk_font_button_new ();
+ gtk_widget_show (margin_x);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE);
- label = gtk_label_new (_("Font color"));
+ label = gtk_label_new (_("Font second line"));
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_color_button_new();
- gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE);
+ margin_x = gtk_font_button_new ();
gtk_widget_show (margin_x);
gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 1, 2, GTK_FILL, 0, 0, 0);
+// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE);
- label = gtk_label_new (_("Font first line"));
- 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 (_("Font second line"));
+ label = gtk_label_new (_("Font color"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 2, 3, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 6, 7, 2, 3, GTK_FILL, 0, 0, 0);
- margin_x = gtk_spin_button_new_with_range (0, 500, 1);
+ margin_x = gtk_color_button_new();
+ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE);
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, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 2, 3, GTK_FILL, 0, 0, 0);
change_paragraph(parent);
}
@@ -1008,9 +1383,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);
@@ -1031,9 +1406,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);
@@ -1073,13 +1448,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);
@@ -1089,54 +1464,55 @@ 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 (_("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 (_("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);
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 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, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), combo_background, 3, 4, 2, 3, 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 (_("Padding vertical"));
+ label = gtk_label_new (_("Font"));
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, 6, 7, 0, 1, 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);
+ margin_x = gtk_font_button_new ();
+ gtk_widget_show (margin_x);
+ gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0);
+// gtk_font_button_set_show_style (GTK_FONT_BUTTON (margin_x), FALSE);
label = gtk_label_new (_("Font color"));
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);
+ gtk_table_attach (GTK_TABLE (table), label, 6, 7, 1, 2, GTK_FILL, 0, 0, 0);
margin_x = gtk_color_button_new();
gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(margin_x), TRUE);
gtk_widget_show (margin_x);
- gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 2, 3, GTK_FILL, 0, 0, 0);
-
- label = gtk_label_new (_("Font"));
- 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);
-
- 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, 2, 3, GTK_FILL, 0, 0, 0);
+ 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);
}