diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 8193a73..9c07ea3 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -17,20 +17,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #ifdef HAVE_VERSION_H #include "version.h" #endif +#include "main.h" #include "common.h" #include "theme_view.h" #include "properties.h" @@ -117,19 +107,19 @@ static const char *global_ui = // define menubar and toolbar action static GtkActionEntry entries[] = { - {"ThemeMenu", NULL, "Theme", NULL, NULL, NULL}, - {"ThemeAdd", GTK_STOCK_ADD, "_Add...", "N", "Add theme", G_CALLBACK (menuAdd)}, - {"ThemeSaveAs", GTK_STOCK_SAVE_AS, "_Save as...", NULL, "Save theme as", G_CALLBACK (menuSaveAs)}, - {"ThemeDelete", GTK_STOCK_DELETE, "_Delete", NULL, "Delete theme", G_CALLBACK (menuDelete)}, - {"ThemeProperties", GTK_STOCK_PROPERTIES, "_Properties...", NULL, "Show properties", G_CALLBACK (menuProperties)}, - {"ThemeQuit", GTK_STOCK_QUIT, "_Quit", "Q", "Quit", G_CALLBACK (menuQuit)}, + {"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL}, + {"ThemeAdd", GTK_STOCK_ADD, _("_Add..."), "N", _("Add theme"), G_CALLBACK (menuAdd)}, + {"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK (menuSaveAs)}, + {"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK (menuDelete)}, + {"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Properties..."), NULL, _("Show properties"), G_CALLBACK (menuProperties)}, + {"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "Q", _("Quit"), G_CALLBACK (menuQuit)}, {"EditMenu", NULL, "Edit", NULL, NULL, NULL}, - {"EditRefresh", GTK_STOCK_REFRESH, "Refresh", NULL, "Refresh", G_CALLBACK (menuRefresh)}, - {"EditRefreshAll", GTK_STOCK_REFRESH, "Refresh all", NULL, "Refresh all", G_CALLBACK (menuRefreshAll)}, + {"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK (menuRefresh)}, + {"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK (menuRefreshAll)}, // {"EditPreferences", GTK_STOCK_PREFERENCES, "Preferences", NULL, "Preferences", G_CALLBACK (menuPreferences)}, - {"ViewApply", GTK_STOCK_APPLY, "Apply", NULL, "Apply theme", G_CALLBACK (menuApply)}, - {"HelpMenu", NULL, "Help", NULL, NULL, NULL}, - {"HelpAbout", GTK_STOCK_ABOUT, "_About", "A", "About", G_CALLBACK (menuAbout)} + {"ViewApply", GTK_STOCK_APPLY, _("Apply"), NULL, _("Apply theme"), G_CALLBACK (menuApply)}, + {"HelpMenu", NULL, _("Help"), NULL, NULL, NULL}, + {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "A", _("About"), G_CALLBACK (menuAbout)} }; @@ -150,12 +140,12 @@ int main (int argc, char ** argv) g_signal_connect(G_OBJECT(g_window), "destroy", G_CALLBACK (menuQuit), NULL); g_signal_connect(g_window, "size-allocate", G_CALLBACK(windowSizeAllocated), NULL); vBox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER(g_window), vBox); + gtk_container_add (GTK_CONTAINER(g_window), vBox); actionGroup = gtk_action_group_new ("menuActionGroup"); - gtk_action_group_add_actions (actionGroup, entries, G_N_ELEMENTS (entries), NULL); + gtk_action_group_add_actions (actionGroup, entries, G_N_ELEMENTS (entries), NULL); globalUIManager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group (globalUIManager, actionGroup, 0); + gtk_ui_manager_insert_action_group (globalUIManager, actionGroup, 0); gtk_ui_manager_add_ui_from_string (globalUIManager, global_ui, -1, NULL ); g_signal_connect(globalUIManager, "add_widget", G_CALLBACK (menuAddWidget), vBox); gtk_ui_manager_ensure_update(globalUIManager); @@ -166,14 +156,19 @@ int main (int argc, char ** argv) // define theme view g_theme_view = create_view(); gtk_container_add(GTK_CONTAINER(scrollbar), g_theme_view); - gtk_widget_show(g_theme_view); + gtk_widget_show(g_theme_view); g_signal_connect(g_theme_view, "button-press-event", (GCallback)view_onButtonPressed, NULL); g_signal_connect(g_theme_view, "popup-menu", (GCallback)view_onPopupMenu, NULL); g_signal_connect(g_theme_view, "row-activated", G_CALLBACK(viewRowActivated), NULL); - // load themes + // load themes load_theme(g_theme_view); + /* temporaire !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + GtkWidget *prop; + prop = create_properties(); + gtk_window_present(GTK_WINDOW(prop)); +*/ gtk_widget_show_all(g_window); gtk_main (); return 0; @@ -182,8 +177,8 @@ int main (int argc, char ** argv) static void menuAddWidget (GtkUIManager * p_uiManager, GtkWidget * p_widget, GtkContainer * p_box) { - gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); - gtk_widget_show(p_widget); + gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); + gtk_widget_show(p_widget); } @@ -345,12 +340,11 @@ static void menuProperties() prop = create_properties(); 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/main.h b/src/tint2conf/main.h new file mode 100644 index 0000000..f463aaf --- /dev/null +++ b/src/tint2conf/main.h @@ -0,0 +1,16 @@ + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef GETTEXT_PACKAGE +#include +#else +#define _(String) String +#endif + diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index 134855a..c4da03c 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -1,23 +1,35 @@ -#include -#include -#include - +#include "main.h" #include "properties.h" +#define ROW_SPACING 10 +#define COL_SPACING 8 +#define DEFAULT_HOR_SPACING 5 + +void change_paragraph(GtkWidget *widget); +void create_panel(GtkWidget *panel); +void create_taskbar(GtkWidget *taskbar); +void create_task(GtkWidget *task); +void create_clock(GtkWidget *clock); +void create_systemtray(GtkWidget *systemtray); +void create_battery(GtkWidget *battery); +void create_mouse(GtkWidget *mouse); +void create_tooltip(GtkWidget *tooltip); +void create_background(GtkWidget *background); + GtkWidget *create_properties() { - GtkWidget *view; + GtkWidget *view, *dialog_vbox3, *button, *notebook; GtkTooltips *tooltips; - GtkWidget *dialog_vbox3; - GtkWidget *notebook2; - GtkWidget *notebook5; + GtkWidget *page_panel, *page_taskbar, *page_task, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_mouse, *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), _("Preferences")); 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); @@ -25,15 +37,429 @@ GtkWidget *create_properties() dialog_vbox3 = GTK_DIALOG (view)->vbox; gtk_widget_show (dialog_vbox3); - notebook2 = gtk_notebook_new (); - gtk_widget_show (notebook2); - gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook2, TRUE, TRUE, 6); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook2), GTK_POS_LEFT); + notebook = gtk_notebook_new (); + gtk_widget_show (notebook); + gtk_container_set_border_width(GTK_CONTAINER(notebook), 5); + gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook, TRUE, TRUE, 6); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_LEFT); - notebook5 = gtk_notebook_new (); - gtk_widget_show (notebook5); - gtk_container_add (GTK_CONTAINER (notebook2), notebook5); + button = gtk_button_new_from_stock ("gtk-apply"); + gtk_widget_show (button); + gtk_dialog_add_action_widget (GTK_DIALOG (view), button, GTK_RESPONSE_APPLY); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + button = gtk_button_new_from_stock ("gtk-cancel"); + gtk_widget_show (button); + gtk_dialog_add_action_widget (GTK_DIALOG (view), button, GTK_RESPONSE_CANCEL); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + + button = gtk_button_new_from_stock ("gtk-ok"); + gtk_widget_show (button); + gtk_dialog_add_action_widget (GTK_DIALOG (view), button, GTK_RESPONSE_OK); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + + // notebook + label = gtk_label_new (_("Panel")); + gtk_widget_show (label); + page_panel = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_panel), 10); + gtk_widget_show (page_panel); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_panel, label); + create_panel(page_panel); + + label = gtk_label_new (_("Taskbar")); + gtk_widget_show (label); + page_taskbar = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_taskbar), 10); + gtk_widget_show (page_taskbar); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_taskbar, label); + create_taskbar(page_taskbar); + + label = gtk_label_new (_("Task")); + gtk_widget_show (label); + page_task = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_task), 10); + gtk_widget_show (page_task); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_task, label); + create_task(page_task); + + label = gtk_label_new (_("Clock")); + gtk_widget_show (label); + page_clock = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_clock), 10); + gtk_widget_show (page_clock); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_clock, label); + create_clock(page_clock); + + label = gtk_label_new (_("Notification")); + gtk_widget_show (label); + page_systemtray = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_systemtray), 10); + gtk_widget_show (page_systemtray); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_systemtray, label); + create_systemtray(page_systemtray); + + label = gtk_label_new (_("Battery")); + gtk_widget_show (label); + page_battery = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_battery), 10); + gtk_widget_show (page_battery); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_battery, label); + create_battery(page_battery); + + label = gtk_label_new (_("Mouse")); + gtk_widget_show (label); + page_mouse = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_mouse), 10); + gtk_widget_show (page_mouse); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_mouse, label); + create_mouse(page_mouse); + + label = gtk_label_new (_("Tooltip")); + gtk_widget_show (label); + page_tooltip = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_tooltip), 10); + gtk_widget_show (page_tooltip); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_tooltip, label); + create_tooltip(page_tooltip); + + label = gtk_label_new (_("Background")); + gtk_widget_show (label); + page_background = gtk_vbox_new (FALSE, DEFAULT_HOR_SPACING); + gtk_container_set_border_width(GTK_CONTAINER(page_background), 10); + gtk_widget_show (page_background); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page_background, label); + create_background(page_background); + printf("create_properties : fin\n"); return view; } + + +void change_paragraph(GtkWidget *widget) +{ + GtkWidget *hbox; + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_box_pack_start(GTK_BOX (widget), hbox, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); +} + + +void create_panel(GtkWidget *panel) +{ + int i; + GtkWidget *screen_position[12]; + GtkWidget *table, *vbox, *hbox, *frame; + GtkWidget *margin_x, *margin_y, *combo_strut_policy, *combo_layer, *combo_width_type, *combo_height_type, *combo_monitor, *combo_background; + GtkWidget *label; + + label = gtk_label_new (_("Position and size")); + 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 (panel), label, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 20); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (panel), 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); + 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); + + 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); + + 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 (_("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 (panel), label, FALSE, FALSE, 0); + + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (panel), 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 (_("Background")); + 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), _("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 x")); + 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 (_("Spacing")); + 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_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, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Padding 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_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(panel); + + label = gtk_label_new (_("Autohide")); + 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 (panel), label, FALSE, FALSE, 0); + + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (panel), 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 (_("Autohide")); + 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_check_button_new (); + gtk_widget_show (margin_x); + gtk_table_attach (GTK_TABLE (table), margin_x, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Show timeout")); + 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, 10000, 0.1); + gtk_widget_show (margin_x); + gtk_table_attach (GTK_TABLE (table), margin_x, 7, 8, 0, 1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Hidden 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_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, 1, 2, GTK_FILL, 0, 0, 0); + + label = gtk_label_new (_("Hide timeout")); + 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_y = gtk_spin_button_new_with_range (0, 10000, 0.1); + gtk_widget_show (margin_y); + gtk_table_attach (GTK_TABLE (table), margin_y, 7, 8, 1, 2, GTK_FILL, 0, 0, 0); + + change_paragraph(panel); + + 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 (panel), label, FALSE, FALSE, 0); + + table = gtk_table_new (2, 10, FALSE); + gtk_widget_show (table); + gtk_box_pack_start (GTK_BOX (panel), 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 (_("Layer")); + 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_layer = gtk_combo_box_new_text (); + gtk_widget_show (combo_layer); + gtk_entry_set_max_length (GTK_ENTRY (combo_layer), 3); + gtk_table_attach (GTK_TABLE (table), combo_layer, 3, 4, 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")); + + label = gtk_label_new (_("Strut policy")); + 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_strut_policy = gtk_combo_box_new_text (); + 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, 0, 1, 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")); + + label = gtk_label_new (_("Place in dock")); + 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_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, 3, 4, 1, 2, GTK_FILL, 0, 0, 0); + +/* + label = gtk_label_new (_("Monitor")); + 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_monitor = gtk_combo_box_new_text (); + gtk_widget_show (combo_monitor); + gtk_entry_set_max_length (GTK_ENTRY (combo_monitor), 3); + gtk_table_attach (GTK_TABLE (table), combo_monitor, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_monitor), _("All")); +*/ + change_paragraph(panel); +} + + +void create_taskbar(GtkWidget *taskbar) +{ +} + + +void create_task(GtkWidget *task) +{ +} + + +void create_clock(GtkWidget *clock) +{ +} + + +void create_systemtray(GtkWidget *systemtray) +{ +} + + +void create_battery(GtkWidget *battery) +{ +} + + +void create_mouse(GtkWidget *mouse) +{ +} + + +void create_tooltip(GtkWidget *tooltip) +{ +} + + +void create_background(GtkWidget *background) +{ +} + diff --git a/src/tint2conf/theme_view.c b/src/tint2conf/theme_view.c index 8cce3f8..b86c9ec 100644 --- a/src/tint2conf/theme_view.c +++ b/src/tint2conf/theme_view.c @@ -1,8 +1,6 @@ -#include -#include -#include +#include "main.h" #include "theme_view.h" // The data columns that we export via the tree model interface