[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (5b3495f138e8866941dd334d57710d043e9e19ba)
The branch, master has been updated
via 5b3495f138e8866941dd334d57710d043e9e19ba (commit)
via 4619ad788b84039721553a974e4032ff6b850f4a (commit)
from f896e7ab766bc8754c8a2f9c28da7d78944b26b6 (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 | 32 ++++++++++++++++----------------
src/hid/gtk/gui-misc.c | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
=================
Commit Messages
=================
commit 5b3495f138e8866941dd334d57710d043e9e19ba
Author: Kai-Martin Knaak <kmk@xxxxxxxxxxxx>
Commit: Felix Ruoff <Felix@xxxxxxxxxxxxxxxxxx>
top-bottom-in-preference-dialog-of-GTK-HID
This patch replaces "component" and "solder" in the preference dialog of
GTK HID with "top" and "bottom". Incindences were in the layer group
tab and in the text of the info tab.
:100644 100644 7b2751a... 2a4fcd8... M src/hid/gtk/gui-config.c
commit 4619ad788b84039721553a974e4032ff6b850f4a
Author: Kai-Martin Knaak <kmk@xxxxxxxxxxxx>
Commit: Felix Ruoff <Felix@xxxxxxxxxxxxxxxxxx>
top/bottom in status line of GTK-HID
This patch replaces "component" and "solder" in the leftmost item of the
status line of the GTK HID with "top" and "bottom".
:100644 100644 0f8daf7... e84b276... M src/hid/gtk/gui-misc.c
=========
Changes
=========
commit 5b3495f138e8866941dd334d57710d043e9e19ba
Author: Kai-Martin Knaak <kmk@xxxxxxxxxxxx>
Commit: Felix Ruoff <Felix@xxxxxxxxxxxxxxxxxx>
top-bottom-in-preference-dialog-of-GTK-HID
This patch replaces "component" and "solder" in the preference dialog of
GTK HID with "top" and "bottom". Incindences were in the layer group
tab and in the text of the info tab.
diff --git a/src/hid/gtk/gui-config.c b/src/hid/gtk/gui-config.c
index 7b2751a..2a4fcd8 100644
--- a/src/hid/gtk/gui-config.c
+++ b/src/hid/gtk/gui-config.c
@@ -1257,7 +1257,7 @@ static gboolean groups_modified, groups_holdoff, layers_applying;
static gchar *layer_info_text[] = {
N_("<h>Layer Names\n"),
N_("You may enter layer names for the layers drawn on the screen.\n"
- "The special 'component side' and 'solder side' are layers which\n"
+ "The special 'top side' and 'bottom side' are layers which\n"
"will be printed out, so they must have in their group at least one\n"
"of the other layers that are drawn on the screen.\n"),
"\n",
@@ -1271,7 +1271,7 @@ static gchar *layer_info_text[] = {
"\n",
N_("For example, for a 4 layer board a useful layer group arrangement\n"
"can be to have 3 screen displayed layers grouped into the same group\n"
- "as the 'component side' and 'solder side' printout layers. Then\n"
+ "as the 'top side' and 'bottom side' printout layers. Then\n"
"groups such as signals, ground, and supply traces can be color\n"
"coded on the screen while printing as a single layer. For this\n"
"you would select buttons and enter names on the Setup page to\n"
@@ -1279,23 +1279,23 @@ static gchar *layer_info_text[] = {
"\n",
N_("<b>Group 1:"),
"\n\t",
- N_("solder"),
+ N_("top"),
"\n\t",
- N_("GND-solder"),
+ N_("GND-top"),
"\n\t",
- N_("Vcc-solder"),
+ N_("Vcc-top"),
"\n\t",
- N_("solder side"),
+ N_("top side"),
"\n",
N_("<b>Group 2:"),
"\n\t",
- N_("component"),
+ N_("bottom"),
"\n\t",
- N_("GND-component"),
+ N_("GND-bottom"),
"\n\t",
- N_("Vcc-component"),
+ N_("Vcc-bottom"),
"\n\t",
- N_("component side"),
+ N_("bottom side"),
"\n",
N_("<b>Group 3:"),
"\n\t",
@@ -1410,21 +1410,21 @@ config_layers_apply (void)
}
/* do some cross-checking
- | solder-side and component-side must be in different groups
- | solder-side and component-side must not be the only one in the group
+ | top-side and bottom-side must be in different groups
+ | top-side and bottom-side must not be the only one in the group
*/
if (layer_groups.Number[soldergroup] <= 1
|| layer_groups.Number[componentgroup] <= 1)
{
Message (_
- ("Both 'solder side' or 'component side' layers must have at least\n"
+ ("Both, 'top side' and 'bottom side' layer must have at least\n"
"\tone other layer in their group.\n"));
return;
}
else if (soldergroup == componentgroup)
{
Message (_
- ("The 'solder side' and 'component side' layers are not allowed\n"
+ ("The 'top side' and 'bottom side' layers are not allowed\n"
"\tto be in the same layer group #\n"));
return;
}
@@ -1535,9 +1535,9 @@ ghid_config_groups_changed(void)
for (layer = 0; layer < max_copper_layer + 2; ++layer)
{
if (layer == component_silk_layer)
- name = _("component side");
+ name = _("top side");
else if (layer == solder_silk_layer)
- name = _("solder side");
+ name = _("bottom side");
else
name = (gchar *) UNKNOWN (PCB->Data->Layer[layer].Name);
commit 4619ad788b84039721553a974e4032ff6b850f4a
Author: Kai-Martin Knaak <kmk@xxxxxxxxxxxx>
Commit: Felix Ruoff <Felix@xxxxxxxxxxxxxxxxxx>
top/bottom in status line of GTK-HID
This patch replaces "component" and "solder" in the leftmost item of the
status line of the GTK HID with "top" and "bottom".
diff --git a/src/hid/gtk/gui-misc.c b/src/hid/gtk/gui-misc.c
index 0f8daf7..e84b276 100644
--- a/src/hid/gtk/gui-misc.c
+++ b/src/hid/gtk/gui-misc.c
@@ -413,7 +413,7 @@ ghid_set_status_line_label (void)
"<b>text</b>=%i%% "
"<b>buffer</b>=#%i"),
Settings.grid_unit->allow,
- Settings.ShowSolderSide ? _("solder") : _("component"),
+ Settings.ShowSolderSide ? _("bottom") : _("top"),
PCB->Grid,
flag, TEST_FLAG (RUBBERBANDFLAG, PCB) ? ",R " : " ",
Settings.LineThickness,
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs