Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6667) +++ trunk/scconfig/Rev.h (revision 6668) @@ -1 +1 @@ -static const int myrev = 6667; +static const int myrev = 6668; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6667) +++ trunk/scconfig/Rev.tab (revision 6668) @@ -1,4 +1,4 @@ -6667 configure gtk splitup +6668 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup 6111 configure layer vs. layer group code split Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 6667) +++ trunk/src/Makefile.dep (revision 6668) @@ -822,7 +822,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.c ../config.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h global_typedefs.h \ @@ -856,7 +857,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h compat_nls.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h compat_nls.h \ ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.h \ ../src_plugins/lib_gtk_common/util_str.h ../src_plugins/hid_gtk/ghid-main-menu.o: \ @@ -892,7 +894,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h misc_util.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h misc_util.h \ error.h ../src_plugins/hid_gtk/gschem_accel_label.h ../src_plugins/hid_gtk/ghid-route-style-selector.o: \ ../src_plugins/hid_gtk/ghid-route-style-selector.c ../config.h \ @@ -927,7 +930,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h compat_nls.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h compat_nls.h ../src_plugins/hid_gtk/ghid-search.o: \ ../src_plugins/hid_gtk/ghid-search.c ../src_3rd/genlist/gendlist.h \ ../config.h ../src_plugins/hid_gtk/gui.h board.h const.h macro.h \ @@ -962,6 +966,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/ghid-search.h \ ../src_plugins/lib_gtk_common/win_place.h hid_actions.h compat_nls.h \ misc_util.h ../src_plugins/hid_gtk/ghid-search-tab.h @@ -1013,7 +1018,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h hid_draw_helpers.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_draw_helpers.h \ hid_attrib.h hid_helper.h hid_color.h ../src_plugins/hid_gtk/gtkhid-main.o: \ ../src_plugins/hid_gtk/gtkhid-main.c ../config.h conf_core.h conf.h \ @@ -1048,7 +1054,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h hid_nogui.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_nogui.h \ hid_draw_helpers.h pcb-printf.h plugins.h hid_attrib.h hid_init.h \ hid_flags.h hid_actions.h plug_footprint.h vtlibrary.h plug_io.h \ misc_util.h layer.h ../src_plugins/hid_gtk/ghid-search.h compat_nls.h \ @@ -1093,7 +1100,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h crosshair.h hid_actions.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h crosshair.h hid_actions.h \ compat_nls.h ../src_plugins/lib_gtk_common/util_str.h ../src_plugins/hid_gtk/gui-config.o: ../src_plugins/hid_gtk/gui-config.c \ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ @@ -1128,6 +1136,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h change.h \ plug_io.h error.h draw.h pcb-printf.h hid_attrib.h misc_util.h \ ../src_plugins/hid_gtk/gtk_conf_list.h paths.h plug_footprint.h \ @@ -1173,6 +1182,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gui-drc-window.h hid_actions.h compat_nls.h \ obj_all.h obj_pinvia_draw.h obj_pad_draw.h obj_rat_draw.h \ obj_line_draw.h obj_arc_draw.h obj_poly_draw.h layer_vis.h \ @@ -1211,7 +1221,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h compat_nls.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h compat_nls.h \ ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/hid_gtk/gui-library-window.o: \ ../src_plugins/hid_gtk/gui-library-window.c ../config.h conf_core.h \ @@ -1245,7 +1256,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h buffer.h plug_footprint.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h buffer.h plug_footprint.h \ vtlibrary.h compat_nls.h ../src_plugins/lib_gtk_common/wt_preview.h \ obj_elem.h layer.h ../src_plugins/lib_gtk_common/ui_zoompan.h \ ../src_plugins/lib_gtk_common/win_place.h \ @@ -1282,7 +1294,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h hid_actions.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h hid_actions.h \ compat_nls.h ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/hid_gtk/gui-misc.o: ../src_plugins/hid_gtk/gui-misc.c \ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ @@ -1317,7 +1330,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -1353,6 +1367,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/win_place.h ../src_plugins/hid_gtk/gui-output-events.o: \ @@ -1388,6 +1403,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h action_helper.h crosshair.h \ draw.h error.h layer.h find.h search.h rats.h netlist.h route_style.h \ rats.h ../src_plugins/lib_gtk_common/in_mouse.h \ @@ -1425,7 +1441,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h copy.h draw.h move.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h copy.h draw.h move.h \ rotate.h ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.h layer.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h \ ../src_plugins/lib_gtk_common/win_place.h @@ -1461,7 +1478,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h hid_cfg_action.h \ + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_cfg_action.h \ action_helper.h buffer.h change.h copy.h crosshair.h draw.h error.h \ plug_io.h find.h insert.h layer.h move.h pcb-printf.h polygon.h rtree.h \ rats.h netlist.h route_style.h remove.h rotate.h search.h rats.h \ @@ -1504,7 +1522,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/menu_lht.o: ../src_plugins/hid_gtk/menu_lht.c ../src_plugins/hid_lesstif/dialogs.o: \ ../src_plugins/hid_lesstif/dialogs.c \ @@ -2201,6 +2220,25 @@ ../src_plugins/lib_gtk_common/bu_check_button.o: \ ../src_plugins/lib_gtk_common/bu_check_button.c ../config.h \ ../src_plugins/lib_gtk_common/bu_check_button.h +../src_plugins/lib_gtk_common/bu_cursor_pos.o: \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.c ../config.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h conf_core.h conf.h \ + global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ + ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ + ../src_3rd/genvector/vtp0.h list_conf.h \ + ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ + ../src_3rd/genlist/gendlist.h globalconst.h hid_actions.h hid.h error.h \ + drc.h attrib.h layer.h obj_all_list.h obj_arc_list.h obj_common.h \ + ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \ + obj_arc.h obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h \ + obj_pad_list.h obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h \ + ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h \ + polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \ + crosshair.h vtonpoint.h misc_util.h compat_nls.h math_helper.h ../src_plugins/lib_gtk_common/bu_entry.o: \ ../src_plugins/lib_gtk_common/bu_entry.c ../config.h \ ../src_plugins/lib_gtk_common/bu_entry.h \ @@ -2303,7 +2341,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/dlg_input.o: \ ../src_plugins/lib_gtk_common/dlg_input.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_input.h @@ -2367,7 +2406,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/dlg_report.o: \ ../src_plugins/lib_gtk_common/dlg_report.c ../config.h \ ../src_plugins/lib_gtk_common/dlg_report.h \ @@ -2409,7 +2449,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/lib_gtk_common/in_mouse.o: \ ../src_plugins/lib_gtk_common/in_mouse.c \ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \ @@ -2447,6 +2488,7 @@ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h \ ../src_plugins/hid_gtk/gui.h ../src_plugins/lib_gtk_common/lib_gtk_common.o: \ ../src_plugins/lib_gtk_common/lib_gtk_common.c plugins.h @@ -2528,7 +2570,8 @@ ../src_plugins/lib_gtk_common/bu_check_button.h \ ../src_plugins/lib_gtk_common/bu_spin_button.h \ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h + ../src_plugins/lib_gtk_common/dlg_propedit.h \ + ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h ../src_plugins/lib_gtk_common/wt_preview.o: \ ../src_plugins/lib_gtk_common/wt_preview.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6667) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6668) @@ -1522,12 +1522,24 @@ return pcb_gtk_act_pan(&gport->view, argc, argv, x, y); } - static void ghid_get_coords(const char *msg, pcb_coord_t * x, pcb_coord_t * y) { pcb_gtk_get_coords(&gport->view, msg, x, y); } +void ghid_status_line_set_text(const gchar *text) +{ + if (!ghidgui->command_entry_status_line_active) + ghid_status_line_set_text_(ghidgui->status_line_label, text); +} + +void ghid_set_status_line_label(void) +{ + if (!ghidgui->command_entry_status_line_active) \ + ghid_set_status_line_label_(ghidgui->status_line_label, conf_hid_gtk.plugins.hid_gtk.compact_horizontal); \ +} + + pcb_hid_action_t ghid_main_action_list[] = { {"About", 0, About, about_help, about_syntax} , Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 6667) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 6668) @@ -35,41 +35,3 @@ const char *ghid_cookie = "gtk hid"; const char *ghid_menu_cookie = "gtk hid menu"; - -void ghid_status_line_set_text(const gchar * text) -{ - if (ghidgui->command_entry_status_line_active) - return; - - if (ghidgui->status_line_label != NULL) - gtk_label_set_markup(GTK_LABEL(ghidgui->status_line_label), text ? text : ""); -} - -/* --------------------------------------------------------------------------- - * output of status line - */ -void ghid_set_status_line_label(void) -{ - const gchar *flag = conf_core.editor.all_direction_lines - ? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_")); - char *text = pcb_strdup_printf(_("%m+view=%s " - "grid=%$mS " - "%s%s " - "line=%mS " - "via=%mS (%mS) %s" - "clearance=%mS " "text=%i%% " "buffer=#%i"), - conf_core.editor.grid_unit->allow, - conf_core.editor.show_solder_side ? _("solder") : _("component"), - PCB->Grid, - flag, conf_core.editor.rubber_band_mode ? ",R " : " ", - conf_core.design.line_thickness, - conf_core.design.via_thickness, - conf_core.design.via_drilling_hole, - conf_hid_gtk.plugins.hid_gtk.compact_horizontal ? "\n" : "", - conf_core.design.clearance, - conf_core.design.text_scale, conf_core.editor.buffer_number + 1); - - ghid_status_line_set_text(text); - free(text); -} - Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 6667) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 6668) @@ -1119,10 +1119,10 @@ ghidgui->status_line_hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(ghidgui->vbox_middle), ghidgui->status_line_hbox, FALSE, FALSE, 0); - label = gtk_label_new(""); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); + label = pcb_gtk_build_status_line_label(); + + ghidgui->status_line_label = label; gtk_box_pack_start(GTK_BOX(ghidgui->status_line_hbox), label, FALSE, FALSE, 0); - ghidgui->status_line_label = label; /* Depending on user setting, the command_combo_box may get packed into | the status_line_hbox, but it will happen on demand the first time Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 6667) +++ trunk/src_plugins/hid_gtk/gui.h (revision 6668) @@ -43,12 +43,13 @@ #include "hid_gtk_conf.h" -/* TODO: REMOVE THIS */ +/* TODO: REMOVE THESE */ #include "../src_plugins/lib_gtk_common/ui_zoompan.h" #include "../src_plugins/lib_gtk_common/bu_box.h" #include "../src_plugins/lib_gtk_common/bu_text_view.h" #include "../src_plugins/lib_gtk_common/bu_check_button.h" #include "../src_plugins/lib_gtk_common/bu_spin_button.h" +#include "../src_plugins/lib_gtk_common/bu_status_line.h" #include "../src_plugins/lib_gtk_common/wt_coord_entry.h" #include "../src_plugins/lib_gtk_common/dlg_propedit.h" @@ -199,13 +200,6 @@ void ghid_layer_buttons_update(void); void ghid_layer_buttons_color_update(void); - -/* gui-misc.c function prototypes -*/ -void ghid_status_line_set_text(const gchar * text); -void ghid_cursor_position_label_set_text(gchar * text); -void ghid_cursor_position_relative_label_set_text(gchar * text); - /* in_mouse.c static variables */ extern GdkPixmap *XC_hand_source, *XC_hand_mask; @@ -279,9 +273,6 @@ guint pad, gfloat value, gfloat low, gfloat high, gfloat step0, gfloat step1, void (*cb_func) (), gpointer data); -void ghid_set_status_line_label(void); - - /* gui-netlist-window.c */ void ghid_netlist_window_create(GHidPort * out); void ghid_netlist_window_show(GHidPort * out, gboolean raise); Index: trunk/src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6667) +++ trunk/src_plugins/lib_gtk_common/Plug.tmpasm (revision 6668) @@ -10,6 +10,7 @@ $(PLUGDIR)/lib_gtk_common/bu_entry.o $(PLUGDIR)/lib_gtk_common/bu_notebook.o $(PLUGDIR)/lib_gtk_common/bu_spin_button.o + $(PLUGDIR)/lib_gtk_common/bu_status_line.o $(PLUGDIR)/lib_gtk_common/bu_text_view.o $(PLUGDIR)/lib_gtk_common/dlg_about.o $(PLUGDIR)/lib_gtk_common/dlg_attribute.o Index: trunk/src_plugins/lib_gtk_common/bu_status_line.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_status_line.c (nonexistent) +++ trunk/src_plugins/lib_gtk_common/bu_status_line.c (revision 6668) @@ -0,0 +1,69 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "config.h" +#include "bu_status_line.h" +#include "conf_core.h" +#include "compat_misc.h" +#include "compat_nls.h" +#include "board.h" + +GtkWidget *pcb_gtk_build_status_line_label(void) +{ + GtkWidget *label = gtk_label_new(""); + gtk_label_set_use_markup(GTK_LABEL(label), TRUE); + + return label; +} + +void ghid_status_line_set_text_(GtkWidget *status_line_label, const gchar * text) +{ + if (status_line_label != NULL) + gtk_label_set_markup(GTK_LABEL(status_line_label), text ? text : ""); +} + +void ghid_set_status_line_label_(GtkWidget *status_line_label, int compat_horiz) +{ + const gchar *flag = conf_core.editor.all_direction_lines + ? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_")); + char *text = pcb_strdup_printf(_("%m+view=%s " + "grid=%$mS " + "%s%s " + "line=%mS " + "via=%mS (%mS) %s" + "clearance=%mS " "text=%i%% " "buffer=#%i"), + conf_core.editor.grid_unit->allow, + conf_core.editor.show_solder_side ? _("solder") : _("component"), + PCB->Grid, + flag, conf_core.editor.rubber_band_mode ? ",R " : " ", + conf_core.design.line_thickness, + conf_core.design.via_thickness, + conf_core.design.via_drilling_hole, + compat_horiz ? "\n" : "", + conf_core.design.clearance, + conf_core.design.text_scale, conf_core.editor.buffer_number + 1); + + ghid_status_line_set_text_(status_line_label, text); + free(text); +} + Index: trunk/src_plugins/lib_gtk_common/bu_status_line.h =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_status_line.h (nonexistent) +++ trunk/src_plugins/lib_gtk_common/bu_status_line.h (revision 6668) @@ -0,0 +1,11 @@ +#include + +GtkWidget *pcb_gtk_build_status_line_label(void); +void ghid_status_line_set_text_(GtkWidget *status_line_label, const gchar * text); + +void ghid_set_status_line_label_(GtkWidget *status_line_label, int compat_horiz); + +/* implemented in hid_gtk* glue layer: */ + +extern void ghid_status_line_set_text(const gchar *text); +extern void ghid_set_status_line_label(void); Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 6667) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 6668) @@ -35,7 +35,6 @@ #include "ui_zoompan.h" /* defined by the hid (gtk version or render specific): */ -void ghid_set_status_line_label(void); void ghid_pan_common(void); void ghid_port_ranges_scale(void); void ghid_invalidate_all();