[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (e24731d843fdff2752a4b0228c533792ba644959)
The branch, master has been updated
via e24731d843fdff2752a4b0228c533792ba644959 (commit)
via f04e7e9296c9492516c891f07d09fa5430e626f0 (commit)
from a547c905e1c0964f5e99c9723d3e5e564c111a79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/hid/gtk/gui-config.c | 30 ---------------------
src/hid/gtk/gui-top-window.c | 60 +++---------------------------------------
src/hid/gtk/gui.h | 7 +++--
3 files changed, 8 insertions(+), 89 deletions(-)
=================
Commit Messages
=================
commit e24731d843fdff2752a4b0228c533792ba644959
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Remove compact_vbox and compact_hbox
:100644 100644 d29d485... 0833486... M src/hid/gtk/gui-config.c
:100644 100644 7ed1d77... 07019df... M src/hid/gtk/gui-top-window.c
:100644 100644 8c6478f... 9376605... M src/hid/gtk/gui.h
commit f04e7e9296c9492516c891f07d09fa5430e626f0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Always show the PCB name on the title-bar, not the toolbar
This saves space and reduces code complexity
:100644 100644 cbd46a4... d29d485... M src/hid/gtk/gui-config.c
:100644 100644 fb5a32a... 7ed1d77... M src/hid/gtk/gui-top-window.c
:100644 100644 1cb3865... 8c6478f... M src/hid/gtk/gui.h
=========
Changes
=========
commit e24731d843fdff2752a4b0228c533792ba644959
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Remove compact_vbox and compact_hbox
diff --git a/src/hid/gtk/gui-config.c b/src/hid/gtk/gui-config.c
index d29d485..0833486 100644
--- a/src/hid/gtk/gui-config.c
+++ b/src/hid/gtk/gui-config.c
@@ -829,20 +829,6 @@ config_compact_horizontal_toggle_cb (GtkToggleButton * button, gpointer data)
gboolean active = gtk_toggle_button_get_active (button);
ghidgui->compact_horizontal = active;
- if (active)
- {
- gtk_container_remove (GTK_CONTAINER (ghidgui->compact_hbox),
- ghidgui->position_hbox);
- gtk_box_pack_end (GTK_BOX (ghidgui->compact_vbox),
- ghidgui->position_hbox, TRUE, FALSE, 0);
- }
- else
- {
- gtk_container_remove (GTK_CONTAINER (ghidgui->compact_vbox),
- ghidgui->position_hbox);
- gtk_box_pack_end(GTK_BOX(ghidgui->compact_hbox), ghidgui->position_hbox,
- FALSE, FALSE, 4);
- }
ghid_set_status_line_label ();
ghidgui->config_modified = TRUE;
}
diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index 7ed1d77..07019df 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -1240,30 +1240,9 @@ ghid_build_pcb_top_window (void)
gtk_container_add (GTK_CONTAINER (ghidgui->mode_buttons1_frame),
ghidgui->mode_buttons1_hbox);
- ghidgui->compact_hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_end (GTK_BOX(ghidgui->top_hbox),
- ghidgui->compact_hbox, FALSE, FALSE, 0);
-
- ghidgui->compact_vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_end (GTK_BOX (ghidgui->top_hbox), ghidgui->compact_vbox,
- FALSE, FALSE, 0);
-
- /*
- * The position_box pack location depends on user setting of
- * compact horizontal mode.
- */
ghidgui->position_hbox = gtk_hbox_new (FALSE, 0);
- g_object_ref(G_OBJECT(ghidgui->position_hbox)); /* so can remove it */
- if (ghidgui->compact_horizontal)
- {
- gtk_box_pack_end (GTK_BOX (ghidgui->compact_vbox),
- ghidgui->position_hbox, TRUE, FALSE, 0);
- }
- else
- {
- gtk_box_pack_end(GTK_BOX(ghidgui->compact_hbox), ghidgui->position_hbox,
- FALSE, FALSE, 4);
- }
+ gtk_box_pack_end (GTK_BOX(ghidgui->top_hbox),
+ ghidgui->position_hbox, FALSE, FALSE, 4);
make_cursor_position_labels (ghidgui->position_hbox, port);
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 8c6478f..9376605 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -104,7 +104,7 @@ typedef struct
GtkEntry *command_entry;
GtkWidget *top_hbox,
- *menu_hbox, *compact_vbox, *compact_hbox, *position_hbox,
+ *menu_hbox, *position_hbox,
*mode_buttons0_vbox, *mode_buttons1_hbox, *mode_buttons1_vbox,
*mode_buttons0_frame, *mode_buttons1_frame, *mode_buttons0_frame_vbox;
GtkWidget *left_toolbar;
commit f04e7e9296c9492516c891f07d09fa5430e626f0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
hid/gtk: Always show the PCB name on the title-bar, not the toolbar
This saves space and reduces code complexity
diff --git a/src/hid/gtk/gui-config.c b/src/hid/gtk/gui-config.c
index cbd46a4..d29d485 100644
--- a/src/hid/gtk/gui-config.c
+++ b/src/hid/gtk/gui-config.c
@@ -122,7 +122,6 @@ static gchar *config_dir, *color_dir;
static ConfigAttribute config_attributes[] = {
{"gui-compact-horizontal", CONFIG_Boolean, &_ghidgui.compact_horizontal},
{"gui-compact-vertical", CONFIG_Boolean, &_ghidgui.compact_vertical},
- {"gui-title-window", CONFIG_Boolean, &_ghidgui.ghid_title_window},
{"use-command-window", CONFIG_Boolean, &_ghidgui.use_command_window},
{"save-in-tmp", CONFIG_Unused, NULL},
{"grid-units", CONFIG_Unused, NULL},
@@ -859,16 +858,6 @@ config_compact_vertical_toggle_cb (GtkToggleButton * button, gpointer data)
}
static void
-config_title_window_cb (GtkToggleButton * button, gpointer data)
-{
- gboolean active = gtk_toggle_button_get_active (button);
-
- ghidgui->ghid_title_window = active;
- ghid_window_set_name_label (ghidgui->name_label_string);
- ghidgui->config_modified = TRUE;
-}
-
-static void
config_general_toggle_cb (GtkToggleButton * button, void * setting)
{
*(gint *)setting = gtk_toggle_button_get_active (button);
@@ -922,11 +911,6 @@ config_general_tab_create (GtkWidget * tab_vbox)
config_compact_vertical_toggle_cb, NULL,
_("Alternate window layout to allow smaller vertical size"));
- ghid_check_button_connected (vbox, NULL, ghidgui->ghid_title_window,
- TRUE, FALSE, FALSE, 2,
- config_title_window_cb, NULL,
- _("Put layout name on the window title bar"));
-
vbox = ghid_category_vbox (tab_vbox, _("Backups"), 4, 2, TRUE, TRUE);
ghid_check_button_connected (vbox, NULL, Settings.SaveInTMP,
TRUE, FALSE, FALSE, 2,
diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index fb5a32a..7ed1d77 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -626,29 +626,13 @@ ghid_window_set_name_label (gchar * name)
if (!ghidgui->name_label_string || !*ghidgui->name_label_string)
ghidgui->name_label_string = g_strdup (_("Unnamed"));
- if (!ghidgui->name_label)
- return;
-
if (!PCB->Filename || !*PCB->Filename)
filename = g_strdup(_("Unsaved.pcb"));
else
filename = g_strdup(PCB->Filename);
- if (ghidgui->ghid_title_window)
- {
- gtk_widget_hide (ghidgui->name_label);
- str = g_strdup_printf ("%s%s (%s) - PCB", PCB->Changed ? "*": "",
- ghidgui->name_label_string, filename);
- }
- else
- {
- gtk_widget_show (ghidgui->name_label);
- str = g_strdup_printf (" <b><big>%s</big></b> ",
- ghidgui->name_label_string);
- gtk_label_set_markup (GTK_LABEL (ghidgui->name_label), str);
- str = g_strdup_printf ("%s%s - PCB", PCB->Changed ? "*": "",
- filename);
- }
+ str = g_strdup_printf ("%s%s (%s) - PCB", PCB->Changed ? "*": "",
+ ghidgui->name_label_string, filename);
gtk_window_set_title (GTK_WINDOW (gport->top_window), str);
g_free (str);
g_free (filename);
@@ -1210,7 +1194,6 @@ ghid_build_pcb_top_window (void)
GtkWidget *vbox, *frame;
GtkWidget *label;
GHidPort *port = &ghid_port;
- gchar *s;
GtkWidget *scrolled;
window = gport->top_window;
@@ -1266,20 +1249,6 @@ ghid_build_pcb_top_window (void)
FALSE, FALSE, 0);
/*
- * The board name is optionally in compact_vbox and the position
- * labels will be packed below or to the side.
- */
- ghidgui->name_label = gtk_label_new ("");
- gtk_label_set_use_markup (GTK_LABEL (ghidgui->name_label), TRUE);
- if (ghidgui->name_label_string)
- s = g_strdup_printf (" <b><big>%s</big></b> ", ghidgui->name_label_string);
- else
- s = g_strdup ("<b><big>%s</big></b>");
- gtk_label_set_markup (GTK_LABEL (ghidgui->name_label), s);
- g_free (s);
- gtk_box_pack_start (GTK_BOX (ghidgui->compact_vbox), ghidgui->name_label, TRUE, FALSE, 6);
-
- /*
* The position_box pack location depends on user setting of
* compact horizontal mode.
*/
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 1cb3865..8c6478f 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -96,7 +96,7 @@ typedef struct
GtkActionGroup *main_actions,
*change_selected_actions, *displayed_name_actions;
- GtkWidget *name_label,
+ GtkWidget
*status_line_label,
*cursor_position_relative_label,
*cursor_position_absolute_label,
@@ -126,7 +126,8 @@ typedef struct
small_label_markup,
compact_horizontal,
compact_vertical,
- ghid_title_window, use_command_window, creating;
+ use_command_window,
+ creating;
gint n_mode_button_columns,
top_window_width,
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs