Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6677) +++ trunk/scconfig/Rev.h (revision 6678) @@ -1 +1 @@ -static const int myrev = 6674; +static const int myrev = 6678; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6677) +++ trunk/scconfig/Rev.tab (revision 6678) @@ -1,4 +1,4 @@ -6674 configure gtk splitup +6678 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 6677) +++ trunk/src/Makefile.dep (revision 6678) @@ -1073,7 +1073,8 @@ ../src_plugins/lib_gtk_common/dlg_input.h \ ../src_plugins/lib_gtk_common/dlg_message.h \ ../src_plugins/lib_gtk_common/dlg_print.h \ - ../src_plugins/lib_gtk_common/dlg_report.h dolists.h \ + ../src_plugins/lib_gtk_common/dlg_report.h \ + ../src_plugins/lib_gtk_common/in_mouse.h dolists.h \ ../src_plugins/hid_gtk/hid_gtk_conf_fields.h ../src_plugins/hid_gtk/gui-command-window.o: \ ../src_plugins/hid_gtk/gui-command-window.c ../config.h conf_core.h \ @@ -1198,43 +1199,6 @@ obj_line_draw.h obj_arc_draw.h obj_poly_draw.h layer_vis.h \ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/win_place.h -../src_plugins/hid_gtk/gui-keyref-window.o: \ - ../src_plugins/hid_gtk/gui-keyref-window.c ../config.h \ - ../src_plugins/hid_gtk/gui.h board.h const.h macro.h global_typedefs.h \ - pcb_bool.h unit.h vtroutestyle.h attrib.h \ - ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h layer.h globalconst.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 ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.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 ../src_3rd/liblihata/genht/ht_inlines.h \ - obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ - obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \ - math_helper.h move.h misc_util.h hid.h error.h drc.h hid_cfg.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 hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ - vtonpoint.h hid.h buffer.h ../src_plugins/hid_gtk/ghid-main-menu.h \ - ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ - event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \ - ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ - ../src_plugins/lib_gtk_common/bu_box.h \ - ../src_plugins/lib_gtk_common/bu_text_view.h \ - ../src_plugins/lib_gtk_common/bu_check_button.h \ - ../src_plugins/lib_gtk_common/bu_spin_button.h \ - ../src_plugins/lib_gtk_common/bu_status_line.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 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 \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ Index: trunk/src_plugins/hid_gtk/gui-keyref-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-keyref-window.c (revision 6677) +++ trunk/src_plugins/hid_gtk/gui-keyref-window.c (nonexistent) @@ -1,353 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Contact addresses for paper mail and Email: - * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany - * Thomas.Nau@rz.uni-ulm.de - * - */ - -/* This file written by Bill Wilson for the PCB Gtk port */ - -#include "config.h" - -#include "gui.h" -#include "compat_nls.h" -#include "../src_plugins/lib_gtk_common/win_place.h" - -static GtkWidget *keyref_window; - -static const gchar *key_ref_text[] = { - "", - N_("Keyboard\n"), - N_("Keyboard shortcuts and actions available in PCB.\n"), - N_("In below key actions, is , is \n"), - N_("and is or \n"), - "\n", - - "\ta\t", - N_("Set layer and size from line or arc\n"), - "\n", - - "a ", - N_("Unselect all objects\n"), - "\n", - - "\tb\t", - N_("Flip element to opposite side of the board\n"), - "\tb\t", - N_("Flip selected objects to opposite side of the board\n"), - "\n", - - "\tc\t", - N_("Copy selected to buffer and unselect\n"), - "\n", - - "\td\t", - N_("Display pin/pad names (numbers with View->Enable pinout shows number)\n"), - "\td\t", - N_("Open pinout window for element under cursor\n"), - "\n", - - "\te\t", - N_("Delete all rats\n"), - "\te\t", - N_("Delete selected rats\n"), - "\n", - - "\tf\t", - N_("Highlight connections to object\n"), - "\tf\t", - N_("Reset highlighted connections\n"), - "\tf\t", - N_("Cumulative highlight connections to object\n"), - "\n", - - "\tg\t", - N_("Increment grid by configured grid increment\n"), - - "\tg\t", - N_("Decrement grid by configured grid increment\n"), - "\n", - - "\th\t", - N_("Toggle visibility of element name under cursor\n"), - - "\th\t", - N_("Toggle visibility of selected element names\n"), - - "\th\t", - N_("Toggle the hole flag of object under cursor\n"), - "\n", - - "\tj\t", - N_("Toggle line/arc should clear polygons flag of object under cursor\n"), - - "\tj\t", - N_("Toggle line/arc should clear polygons flag of selected\n"), - "\n", - - "\tk\t", - N_("Increase clearance of object by configured clearance\n"), - - "\tk\t", - N_("Decrease clearance of object by configured clearance\n"), - - "\tk\t", - N_("Increase clearance of selected objects by configured clearance\n"), - - "k ", - N_("Decrease clearance of selected objects by configured clearance\n"), - "\n", - - "\tl\t", - N_("Increment current route style line size by configured line increment\n"), - - "\tl\t", - N_("Decrement current route style line size by configured line increment\n"), - "\n", - - "\tm\t", - N_("Move object to current layer\n"), - - "\tm\t", - N_("Move selected objects to current layer\n"), - - "\tm\t", - N_("Mark at cursor location for showing relative offsets\n"), - "\n", - - "\tn\t", - N_("Select the shortest unselected rat on the board\n"), - "\n", - - "\to\t", - N_("Optimize and draw all rats\n"), - - "\to\t", - N_("Optimize and draw selected rats\n"), - "\n", - - "\to\t", - N_("Change octagon flag of object\n"), - "\n", - - "\tp\t", - N_("Backup polygon drawing to previous point\n"), - - "\tp\t", - N_("Close polygon\n"), - "\n", - - "\tq\t", - N_("Toggle the square flag of an object\n"), - "\n", - - "\tr\t", - N_("Redo last undone operation\n"), - "\n", - - "\ts\t", - N_("Increment size of an object by configured size increment\n"), - "\ts\t", - N_("Decrement size of an object by configured size increment\n"), - "\ts\t", - N_("Increment drill size of a pin or via\n"), - "s ", - N_("Decrement drill size of a pin or via\n"), - "\n", - - "\tt\t", - N_("Adjust text scale so new text increases by the configured size increment\n"), - "\tt\t", - N_("Adjust text scale so new text decreases by the configured size increment\n"), - "\n", - - "\tu\t", - N_("Undo last operation\n"), - "\n", - - "\tv\t", - N_("Zoom to board extents\n"), - "\tv\t", - N_("Increment current route style via size\n"), - "v ", - N_("Decrement current route style via size\n"), - "\tv\t", - N_("Increment current route style via hole size\n"), - "v ", - N_("Decrement current route style via hole size\n"), - "\n", - - "\tx\t", - N_("Copy selection to buffer and enter pastebuffer mode\n"), - "x ", - N_("Cut selection to buffer and enter pastebuffer mode\n"), - "\n", - - "\tz\t", - N_("Zoom in\n"), - "\tz\t", - N_("Zoom out\n"), - "\n", - - "\t|\t", - N_("Toggle thin draw mode\n"), - "\n", - - "\t/\t", - N_("Cycle multiline mode (Using overrides)\n"), - "\n", - - "\t.\t", - N_("Toggle all direction lines mode\n"), - "\n", - - "\tEsc\t", - N_("If drawing an object, return to a neutral state.\n"), - "\n", - - "\tTab\t", - N_("Switch view to other side\n"), - "\n", - - " Space\t", - N_("Switch to select mode\n"), - "\n", - - "\t:\t", - N_("Enter user command or pop up command window\n"), - "\n", - - "\tDEL\t", - N_("Delete object\n"), - "\n", - - "\t1-9\t", - N_("Select drawing layers\n"), - "\n", - - "\t1-5\t", - N_("Select current buffer\n"), - "\n", - "\n", - "", - N_("Mouse\n"), - N_("Modifier key use can be combined with mouse button presses\n" "to modify mouse button actions.\n"), - "\n", - N_("Left button\n"), - N_("\tPerform or initiate action determined by current mode.\n"), - "\n", - "\t", - N_(""), - N_(" - change rotation direction for rotation tool actions.\n"), - "\n", - N_("\tAfter a draw operation has been left mouse button initiated,\n" "\tmodifier key effects:\n"), - "\t", - N_(""), - N_(" - change line 45 degree direction and arc angle direction,\n"), - "\n", - N_("Middle button\n"), - N_("\tIf a line, arc, rectangle, or polygon draw operation has been\n" - "\tinitiated, a click restarts the draw operation at the cursor position.\n"), - "\n", - N_("\tIf such a draw has not been initiated, a click selects objects and\n" "\ta press and drag moves objects.\n"), - "\n", - N_("Right button\n"), - N_("\tPress and drag to pan.\n" "\tWhile drawing or moving, a click without a drag toggles auto pan mode.\n"), - "\n\t", - N_(""), - N_(" - Popup a menu.\n"), - "\n", - N_("Scroll wheel\n"), - N_("\tZoom in/out.\n"), - "\n\t", - N_(""), - N_(" - pan vertically.\n"), - "\t", - N_(""), - N_(" - pan horizontally.\n"), - "\n", - N_("Usage:\n"), - N_("\tMouse actions can typically be combined. For example: while moving\n" - "\tan object (with left or middle press and drag), the right button may\n" - "\tbe simultaneously clicked to toggle auto pan or pressed and dragged\n" - "\tto manually pan. Mouse moving or drawing may also be combined with\n" "\tkey actions.\n"), -}; - - - - - /* Remember user window resizes. - */ -static gint keyref_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, gpointer data) -{ - wplc_config_event(widget, &hid_gtk_wgeo.keyref_x, &hid_gtk_wgeo.keyref_y, &hid_gtk_wgeo.keyref_width, &hid_gtk_wgeo.keyref_height); - return FALSE; -} - -static void keyref_close_cb(gpointer data) -{ - gtk_widget_destroy(keyref_window); - keyref_window = NULL; -} - -static void keyref_destroy_cb(GtkWidget * widget, gpointer data) -{ - keyref_window = NULL; -} - -void ghid_keyref_window_show(gboolean raise) -{ - GtkWidget *vbox, *hbox, *button, *text; - gint i; - - if (keyref_window) { - if (raise) - gtk_window_present(GTK_WINDOW(keyref_window)); - return; - } - keyref_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(keyref_window), "destroy", G_CALLBACK(keyref_destroy_cb), NULL); - g_signal_connect(G_OBJECT(keyref_window), "configure_event", G_CALLBACK(keyref_window_configure_event_cb), NULL); - gtk_window_set_title(GTK_WINDOW(keyref_window), _("pcb-rnd Key Reference")); - gtk_window_set_wmclass(GTK_WINDOW(keyref_window), "PCB_Keyref", "PCB"); - gtk_window_set_default_size(GTK_WINDOW(keyref_window), hid_gtk_wgeo.keyref_width, hid_gtk_wgeo.keyref_height); - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - gtk_container_add(GTK_CONTAINER(keyref_window), vbox); - - text = ghid_scrolled_text_view(vbox, NULL, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - for (i = 0; i < sizeof(key_ref_text) / sizeof(gchar *); ++i) - ghid_text_view_append(text, _(key_ref_text[i])); - - /* The keyref window close button. - */ - hbox = gtk_hbutton_box_new(); - gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(keyref_close_cb), NULL); - gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); - - gtk_widget_show_all(keyref_window); - -} Index: trunk/src_plugins/hid_gtk/Plug.tmpasm =================================================================== --- trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6677) +++ trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6678) @@ -9,7 +9,6 @@ $(PLUGDIR)/hid_gtk/gui-command-window.o $(PLUGDIR)/hid_gtk/gui-config.o $(PLUGDIR)/hid_gtk/gui-drc-window.o - $(PLUGDIR)/hid_gtk/gui-keyref-window.o $(PLUGDIR)/hid_gtk/gui-library-window.o $(PLUGDIR)/hid_gtk/gui-log-window.o $(PLUGDIR)/hid_gtk/gui-netlist-window.o Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 6677) +++ trunk/src_plugins/hid_gtk/gui.h (revision 6678) @@ -288,9 +288,6 @@ gchar *ghid_command_entry_get(const gchar * prompt, const gchar * command); void ghid_command_use_command_window_sync(void); -/* gui-keyref-window.c */ -void ghid_keyref_window_show(gboolean raise); - /* gui-library-window.c */ void ghid_library_window_create(GHidPort * out); void ghid_library_window_show(GHidPort * out, gboolean raise);