Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=d4d5d5317c9d6f92f60ff1f035bd70c861e6e861

commit d4d5d5317c9d6f92f60ff1f035bd70c861e6e861
Author: Elentir <elen...@mailoo.org>
Date:   Sat Jan 23 01:11:45 2010 +0100

remove fixed font size from some labels

diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 7f0cd8b..98bb5d6 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -2,7 +2,7 @@
*  configsource.c for Fwife
*
*  Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
- *  Copyright (c) 2008, 2009, 2010 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -272,7 +272,7 @@ GtkWidget *load_gtk_widget()
/* top info label */
info = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(info),
-                                               _("<span font=\"11\"><b>You can 
choose one or more nearly mirrors to speed up package 
downloading.</b></span>"));
+                                               _("<b>You can choose one or 
more nearly mirrors to speed up package downloading.</b>"));

gtk_box_pack_start (GTK_BOX (pVBox), info, FALSE, FALSE, 5);

diff --git a/src/plugins/greet.c b/src/plugins/greet.c
index 255d54d..dc1895e 100644
--- a/src/plugins/greet.c
+++ b/src/plugins/greet.c
@@ -1,7 +1,7 @@
/*
*  greet.c for Fwife
*
- *  Copyright (c) 2008, 2009, 2010 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -61,7 +61,7 @@ GtkWidget *load_gtk_widget()
gtk_label_set_markup(GTK_LABEL(widget), _("<b>Welcome among the users of 
Frugalware!\n\n</b>\n"
"The aim of creating Frugalware was to help you to do your work faster and 
simpler.\n"
"We hope that you will like our product.\n\n"
-                                               "<span style=\"italic\" 
font=\"10\" foreground=\"#0000FF\">The Frugalware Developer Team</span>\n"));
+                                               "<span style=\"italic\" 
foreground=\"#0000FF\">The Frugalware Developer Team</span>\n"));

return widget;
}
diff --git a/src/plugins/grubconf.c b/src/plugins/grubconf.c
index ea7e294..edd9b72 100644
--- a/src/plugins/grubconf.c
+++ b/src/plugins/grubconf.c
@@ -2,7 +2,7 @@
*  grubconf.c for Fwife
*
*  Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
- *  Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -72,7 +72,7 @@ GtkWidget *load_gtk_widget()
GtkWidget *pLabelInfo=gtk_label_new(NULL);

/* top info label */
-       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span 
font=\"11\"><b>Installing GRUB bootloader</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<b>Installing GRUB 
bootloader</b>"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 6);

GtkWidget *pLabel = gtk_label_new(_("Choose install type :"));
diff --git a/src/plugins/layout.c b/src/plugins/layout.c
index 85b2c4d..1fd22d9 100644
--- a/src/plugins/layout.c
+++ b/src/plugins/layout.c
@@ -2,7 +2,7 @@
*  layout.c for Fwife
*
*  Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
- *  Copyright (c) 2008 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -414,7 +414,7 @@ GtkWidget *load_gtk_widget()

/* top info label */
GtkWidget *labelhelp = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(labelhelp), _("<span font=\"11\"><b>You 
may select one of the following keyboard maps.</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(labelhelp), _("<b>You may select one of 
the following keyboard maps.</b>"));
gtk_box_pack_start(GTK_BOX(pvbox), labelhelp, FALSE, FALSE, 6);
gtk_box_pack_start(GTK_BOX(pvbox), pScrollbar, TRUE, TRUE, 0);

diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 5f667eb..988c169 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -1,7 +1,7 @@
/*
*  netconf.c for Fwife
*
- *  Copyright (c) 2008,2009 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -763,7 +763,7 @@ GtkWidget *load_gtk_widget()
hboxview = gtk_hbox_new(FALSE, 0);

info = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>You can 
configure all network interfaces you need</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(info), _("<b>You can configure all 
network interfaces you need</b>"));
gtk_box_pack_start(GTK_BOX(pVBox), info, FALSE, FALSE, 5);

store = gtk_list_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING);
diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index decd7b6..3ca8f29 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -2,7 +2,7 @@
*  partdisk.c for Fwife
*
*  Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
- *  Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -560,11 +560,11 @@ int requestformat(char *namedev)
GtkWidget *pVBox = GTK_DIALOG(pBoite)->vbox;

GtkWidget *pLabelInfo = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span font=\"11\" 
foreground=\"#f90909\"><b>!!! NOTE: This will erase all data on it. Would you 
like to format this partition? !!!</b></span>\n"));
+       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span 
foreground=\"#f90909\"><b>!!! NOTE: This will erase all data on it. Would you 
like to format this partition? !!!</b></span>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 0);

GtkWidget *pLabel = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(pLabel), _("<span font=\"11\"><b>Choose 
filesystem :</b></span>\n"));
+       gtk_label_set_markup(GTK_LABEL(pLabel), _("<b>Choose filesystem 
:</b>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabel, FALSE, FALSE, 2);

/* Ext3 filesystem - default*/
@@ -595,7 +595,7 @@ int requestformat(char *namedev)
gtk_box_pack_start (GTK_BOX (pVBox), separator, FALSE, FALSE, 5);

GtkWidget *pLabel2 = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(pLabel2), _("<span 
font=\"11\"><b>Options :</b></span>\n"));
+       gtk_label_set_markup(GTK_LABEL(pLabel2), _("<b>Options :</b>\n"));
gtk_box_pack_start(GTK_BOX(pVBox), pLabel2, FALSE, FALSE, 5);

GtkWidget *check = gtk_check_button_new_with_label(_("Check for bad blocks - 
slowly"));
@@ -646,7 +646,7 @@ int requestformat(char *namedev)
} else {
gboolean checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
// change label
-                       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span 
font=\"11\"><b>Creating filesystem... Please wait ... </b></span>\n"));
+                       gtk_label_set_markup(GTK_LABEL(pLabelInfo), 
_("<b>Creating filesystem... Please wait ... </b>\n"));
// hide all widgets
gtk_widget_hide(pLabel);
gtk_widget_hide(pLabel2);
@@ -715,7 +715,7 @@ int swapformat(char *namedev)
GtkWidget *pLabelInfo=gtk_label_new(NULL);

/* On utilise les balises */
-       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span font=\"11\" 
foreground=\"#f90909\"><b>You need to format is you want to use it as a swap 
partition!\nThis will erase all your data on that partition !\n\n Do you want 
to continue? </b></span>\n"));
+       gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<span 
foreground=\"#f90909\"><b>You need to format is you want to use it as a swap 
partition!\nThis will erase all your data on that partition !\n\n Do you want 
to continue? </b></span>\n"));

gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 0);

@@ -915,7 +915,7 @@ GtkWidget *load_gtk_widget()
pVBox = gtk_vbox_new(FALSE, 5);

info = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>Select 
and format your partitions or launch GParted to modify them.</b></span>\n"));
+       gtk_label_set_markup(GTK_LABEL(info), _("<b>Select and format your 
partitions or launch GParted to modify them.</b>\n"));
gtk_box_pack_start (GTK_BOX (pVBox),info, FALSE, FALSE, 10);

/* HBox for disk information and selection */
diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c
index 645aa72..d32db3a 100644
--- a/src/plugins/postconf.c
+++ b/src/plugins/postconf.c
@@ -2,7 +2,7 @@
*  finish.c for Fwife
*
*  Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org>
- *  Copyright (c) 2008 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -615,7 +615,7 @@ GtkWidget *load_gtk_widget(GtkWidget *assist)
pVBox = gtk_vbox_new(FALSE, 0);

info = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>You can 
configure some parts of your system</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(info), _("<b>You can configure some 
parts of your system</b>"));
gtk_box_pack_start(GTK_BOX(pVBox), info, FALSE, FALSE, 6);

pFrame = gtk_frame_new(_("Hardware"));
diff --git a/src/plugins/rootconf.c b/src/plugins/rootconf.c
index 5fbc33f..33d5dfa 100644
--- a/src/plugins/rootconf.c
+++ b/src/plugins/rootconf.c
@@ -1,7 +1,7 @@
/*
*  rootconf.c for Fwife
*
- *  Copyright (c) 2008 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -78,7 +78,7 @@ GtkWidget *load_gtk_widget()
vboxp = gtk_vbox_new(FALSE, 5);
info = gtk_label_new(NULL);
gtk_label_set_justify(GTK_LABEL(info), GTK_JUSTIFY_CENTER);
-       gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>You can 
set password on the system administrator account (root).\n It is recommended 
that you set one now so that it is active the first time the machine is 
rebooted.\n This is especially important if your machine is on an internet 
connected LAN.\n Is you don't want to set one, keep entry empty and go to the 
next step.</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(info), _("<b>You can set password on the 
system administrator account (root).\n It is recommended that you set one now 
so that it is active the first time the machine is rebooted.\n This is 
especially important if your machine is on an internet connected LAN.\n Is you 
don't want to set one, keep entry empty and go to the next step.</b>"));

gtk_box_pack_start (GTK_BOX (vboxp), info, FALSE, FALSE, 10);

diff --git a/src/plugins/usersconf.c b/src/plugins/usersconf.c
index 717dfff..8a73699 100644
--- a/src/plugins/usersconf.c
+++ b/src/plugins/usersconf.c
@@ -1,7 +1,7 @@
/*
*  userconf.c for Fwife
*
- *  Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net>
+ *  Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net>
*
*  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
@@ -279,7 +279,7 @@ GtkWidget *load_gtk_widget()

/* top info label */
info = gtk_label_new(NULL);
-       gtk_label_set_markup(GTK_LABEL(info), _("<span font=\"11\"><b>You can 
configure non-root user account. It is strongly recommended to create 
one.</b></span>"));
+       gtk_label_set_markup(GTK_LABEL(info), _("<b>You can configure non-root 
user account. It is strongly recommended to create one.</b>"));

store = gtk_list_store_new(6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF);
model = GTK_TREE_MODEL(store);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to