Index: theme.c
===================================================================
RCS file: /cvs/gpe/base/gpe-conf/theme.c,v
retrieving revision 1.48
diff -u -r1.48 theme.c
--- theme.c 2 Sep 2004 17:55:04 -0000 1.48
+++ theme.c 22 Sep 2004 16:40:31 -0000
@@ -1066,10 +1066,16 @@
gtk_container_set_border_width (GTK_CONTAINER (table), gpe_border);
gtk_table_set_row_spacings (GTK_TABLE (table), gpe_boxspacing);
gtk_table_set_col_spacings (GTK_TABLE (table), gpe_boxspacing);
+#else
#endif
+
label = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(label),0.0,0.5);
+#ifndef APPMGR_INTERFACE
tstr = g_strdup_printf ("%s", _("Background Settings"));
+#else
+ tstr = g_strdup_printf ("\n%s", _("Background Settings"));
+#endif
gtk_label_set_markup (GTK_LABEL (label), tstr);
g_free (tstr);
@@ -1200,7 +1206,11 @@
#endif
label = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(label),0.0,0.5);
+#ifndef APPMGR_INTERFACE
tstr = g_strdup_printf ("%s", _("Toolbar Style"));
+#else
+ tstr = g_strdup_printf ("\n%s", _("Toolbar Style"));
+#endif
gtk_label_set_markup (GTK_LABEL (label), tstr);
g_free (tstr);
#ifndef APPMGR_INTERFACE
@@ -1232,7 +1242,7 @@
(GtkAttachOptions) (table_attach_left_col_x),
(GtkAttachOptions) (table_attach_left_col_y), 0, 0);
- hbox = gtk_hbox_new(TRUE, gpe_get_boxspacing());
+ hbox = gtk_hbox_new(FALSE, gpe_get_boxspacing());
gtk_table_attach (GTK_TABLE (table), hbox, 0, 4, 11, 12,
(GtkAttachOptions) (table_attach_left_col_x),
(GtkAttachOptions) (table_attach_left_col_y), 0, 0);
@@ -1244,10 +1254,10 @@
(GTK_RADIO_BUTTON(self.rbToolIcons), _("Text"));
gtk_box_pack_start(GTK_BOX(hbox), self.rbToolText, FALSE, TRUE, 0);
self.rbToolBoth = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON(self.rbToolIcons), _("Both"));
+ (GTK_RADIO_BUTTON(self.rbToolIcons), _("Both (icon above text)"));
gtk_box_pack_start(GTK_BOX(hbox), self.rbToolBoth, FALSE, TRUE, 0);
self.rbToolBothH = gtk_radio_button_new_with_label_from_widget
- (GTK_RADIO_BUTTON(self.rbToolIcons), _("Both H"));
+ (GTK_RADIO_BUTTON(self.rbToolIcons), _("Both (icon left of text)"));
gtk_box_pack_start(GTK_BOX(hbox), self.rbToolBothH, FALSE, TRUE, 0);
#endif
@@ -1334,7 +1344,11 @@
/*---------------------------------------------*/
label = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(label),0.0,0.5);
+#ifndef APPMGR_INTERFACE
tstr = g_strdup_printf ("%s", _("Application Font"));
+#else
+ tstr = g_strdup_printf ("\n%s", _("Application Font"));
+#endif
gtk_label_set_markup (GTK_LABEL (label), tstr);
g_free (tstr);
#ifndef APPMGR_INTERFACE
@@ -1402,7 +1416,7 @@
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 13, 14,
(GtkAttachOptions) (table_attach_left_col_x),
(GtkAttachOptions) (table_attach_left_col_y), gpe_boxspacing, 0);
- self.spFSApp = gtk_spin_button_new_with_range(5,20,1);
+ self.spFSApp = gtk_spin_button_new_with_range(5,16,1);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(self.spFSApp),8.0);
gtk_table_attach (GTK_TABLE (table), self.spFSApp, 1, 2, 14, 15,
(GtkAttachOptions) (table_attach_left_col_x),
Index: login-setup.c
===================================================================
RCS file: /cvs/gpe/base/gpe-conf/login-setup.c,v
retrieving revision 1.10
diff -u -r1.10 login-setup.c
--- login-setup.c 11 Aug 2004 21:24:15 -0000 1.10
+++ login-setup.c 22 Sep 2004 16:40:31 -0000
@@ -41,19 +41,12 @@
GtkWidget *login_lock_display_check;
GtkWidget *controlvbox1;
-GtkWidget *login_bg_file_label;
-GtkWidget *login_bg_file_entry;
-GtkWidget *login_bg_file_button;
-
-gboolean login_bg_show = FALSE;
gboolean login_lock_display = FALSE;
gboolean ownerinfo_show = FALSE;
-gboolean login_bg_show_initial = FALSE;
gboolean ownerinfo_show_initial = FALSE;
gboolean login_lock_display_initial = FALSE;
-gboolean login_bg_show_writable = FALSE;
gboolean ownerinfo_show_writable = FALSE;
gboolean login_lock_script_writable = FALSE;
@@ -62,9 +55,8 @@
static gchar login_bg_filename[PATH_MAX + 1] = "";
-
void update_login_lock (GtkWidget *togglebutton,gpointer user_data);
-static void File_Selected (char *file, gpointer data);
+
GtkWidget *Login_Setup_Build_Objects()
{
@@ -86,31 +78,15 @@
guint gpe_boxspacing = gpe_get_boxspacing ();
guint gpe_border = gpe_get_border ();
- gint bytes;
gchar *tstr;
- if ((bytes = readlink (GPE_LOGIN_BG_LINKED_FILE,
- login_bg_filename,
- PATH_MAX - 1)) < 0)
- {
- perror ("login-setup: Cannot read file at end of symlink (with readlink)");
- login_bg_filename[0] = '\0';
- }
- else
- {
- login_bg_filename[bytes] = '\0';
- }
- g_message ("login-setup: File at end of symlink: %s", login_bg_filename);
-
if (suid_exec("CHEK",""))
{
- login_bg_show_writable = FALSE;
ownerinfo_show_writable = FALSE;
login_lock_script_writable = FALSE;
}
else
{
- login_bg_show_writable = TRUE;
ownerinfo_show_writable = TRUE;
login_lock_script_writable = TRUE;
}
@@ -125,7 +101,7 @@
rootwarn_hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (rootwarn_hbox);
- rootwarn_label = gtk_label_new (_("Some or all of these settings can only be changed by the user 'root'."));
+ rootwarn_label = gtk_label_new (_("Some of these settings can only be changed by the user 'root'."));
gtk_widget_show (rootwarn_label);
gtk_label_set_justify (GTK_LABEL (rootwarn_label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (rootwarn_label), TRUE);
@@ -136,7 +112,7 @@
gtk_misc_set_alignment (GTK_MISC (rootwarn_icon), 0, 0);
gtk_box_pack_start (GTK_BOX (rootwarn_hbox), rootwarn_icon, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (rootwarn_hbox), rootwarn_label, TRUE, TRUE, gpe_boxspacing);
- if ((!login_bg_show_writable) || (!ownerinfo_show_writable))
+ if (!ownerinfo_show_writable)
gtk_box_pack_start (GTK_BOX (mainvbox), rootwarn_hbox, FALSE, TRUE, 0);
/* -------------------------------------------------------------------------- */
@@ -166,42 +142,18 @@
ownerinfo_show_check =
gtk_check_button_new_with_label (_("Show owner information at login."));
- login_bg_show_check =
- gtk_check_button_new_with_label (_("Use background image for login screen."));
login_lock_display_check =
gtk_check_button_new_with_label (_("Lock display on suspend."));
/* check the dontshow files to set initial values for the checkboxes */
get_initial_values();
ownerinfo_show = ownerinfo_show_initial;
- login_bg_show = login_bg_show_initial;
login_lock_display = login_lock_display_initial;
gtk_box_pack_start (GTK_BOX(controlvbox1), ownerinfo_show_check, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(controlvbox1), login_bg_show_check, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(controlvbox1), login_lock_display_check, FALSE, FALSE, 0);
/* ------------------------------------------------------------------------ */
- login_bg_file_label = gtk_label_new (_("Image:"));
- gtk_box_pack_start (GTK_BOX(controlvbox1), login_bg_file_label, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (login_bg_file_label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (login_bg_file_label), 0, 0.5);
- gtk_misc_set_padding (GTK_MISC (login_bg_file_label), 0, gpe_boxspacing);
-
- login_bg_file_entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX(controlvbox1), login_bg_file_entry, FALSE, FALSE, 0);
- gtk_entry_set_text (GTK_ENTRY (login_bg_file_entry), login_bg_filename);
-
- login_bg_file_button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX(controlvbox1), login_bg_file_button, TRUE, TRUE, 0);
-
- gtk_signal_connect (GTK_OBJECT (login_bg_file_button), "clicked",
- GTK_SIGNAL_FUNC (choose_login_bg_file),
- NULL);
-
- gtk_signal_connect (GTK_OBJECT (login_bg_show_check), "clicked",
- GTK_SIGNAL_FUNC (update_login_bg_show),
- NULL);
gtk_signal_connect (GTK_OBJECT (ownerinfo_show_check), "clicked",
GTK_SIGNAL_FUNC (update_ownerinfo_show),
NULL);
@@ -214,39 +166,6 @@
else
gtk_widget_set_sensitive (ownerinfo_show_check, FALSE);
- if (login_bg_show)
- {
- gtk_widget_set_sensitive (login_bg_file_label, TRUE);
- gtk_widget_set_sensitive (login_bg_file_entry, TRUE);
- gtk_widget_set_sensitive (login_bg_file_button, TRUE);
- }
- else
- {
- gtk_widget_set_sensitive (login_bg_file_label, FALSE);
- gtk_widget_set_sensitive (login_bg_file_entry, FALSE);
- gtk_widget_set_sensitive (login_bg_file_button, FALSE);
- }
-
- if (login_bg_show_writable)
- {
- gtk_widget_set_sensitive (login_bg_show_check, TRUE);
- gtk_widget_set_sensitive (login_bg_file_label, TRUE);
- gtk_widget_set_sensitive (login_bg_file_entry, TRUE);
- gtk_widget_set_sensitive (login_bg_file_button, TRUE);
- gtk_widget_set_sensitive (login_lock_display_check, TRUE);
- }
- else
- {
- gtk_widget_set_sensitive (login_bg_show_check, FALSE);
- gtk_widget_set_sensitive (login_bg_file_label, FALSE);
- gtk_widget_set_sensitive (login_bg_file_entry, FALSE);
- gtk_widget_set_sensitive (login_lock_display_check, FALSE);
- }
-
- gtk_signal_connect (GTK_OBJECT (login_bg_file_button), "size_allocate",
- GTK_SIGNAL_FUNC (on_login_bg_file_button_size_allocate),
- NULL);
-
return mainvbox;
}
@@ -272,10 +191,6 @@
Login_Setup_Restore ()
{
g_message ("Requested explicit restoration of initial values.");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(login_bg_show_check),
- login_bg_show_initial);
- login_bg_show = login_bg_show_initial;
-
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(ownerinfo_show_check),
ownerinfo_show_initial);
ownerinfo_show = ownerinfo_show_initial;
@@ -287,49 +202,11 @@
void
-choose_login_bg_file (GtkWidget *button,
- gpointer user_data)
-{
- ask_user_a_file (gpe_dirname (login_bg_filename), NULL, File_Selected, NULL, NULL);
-}
-
-static void
-File_Selected (char *file,
- gpointer data)
-{
- /* check if we can read the selected file */
- /* FIXME: gotta check if it's a valid png file */
- if (access (file, R_OK) == 0) {
- gtk_entry_set_text (GTK_ENTRY (login_bg_file_entry), file);
-
- if (login_bg_pixmap != NULL)
- gtk_container_remove (GTK_CONTAINER (login_bg_file_button), login_bg_pixmap);
- login_bg_pixmap = gpe_create_pixmap (controlvbox1, file,
- buttonwidth,
- buttonheight);
- gtk_container_add (GTK_CONTAINER (login_bg_file_button), login_bg_pixmap);
- gtk_widget_show (GTK_WIDGET (login_bg_pixmap));
- }
- else {
- g_message ("Can't read '%s'.", file);
- }
-
- strncpy (login_bg_filename, file, sizeof (login_bg_filename));
-
- update_login_bg_show ();
-}
-
-
-void
get_initial_values ()
{
g_message ("Checking the dontshow files to set initial values for the checkboxes.");
+
/* check if the dontshow files are there */
- if (access (GPE_LOGIN_BG_DONTSHOW_FILE, F_OK) == 0)
- login_bg_show_initial = FALSE;
- else
- login_bg_show_initial = TRUE;
-
if (access (GPE_OWNERINFO_DONTSHOW_FILE, F_OK) == 0)
ownerinfo_show_initial = FALSE;
else
@@ -340,9 +217,6 @@
else
login_lock_display_initial = TRUE;
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(login_bg_show_check),
- login_bg_show_initial);
-
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(ownerinfo_show_check),
ownerinfo_show_initial);
@@ -350,21 +224,6 @@
login_lock_display_initial);
}
-
-void
-update_login_bg_show ()
-{
- char uc[3];
-
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(login_bg_show_check)))
- login_bg_show = TRUE;
- else
- login_bg_show = FALSE;
-
- sprintf(uc,"%i",login_bg_show);
- suid_exec("ULBS",uc);
-}
-
void
update_ownerinfo_show ()
{
@@ -380,39 +239,6 @@
}
-void
-on_login_bg_file_button_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation,
- gpointer user_data)
-{
- /* Note: this updates only the first time the button/pixmap is
- drawn, but this is fine. */
-
- /* sanity check */
- if (access(login_bg_filename,R_OK))
- {
- login_bg_pixmap = NULL;
- return;
- }
-
- buttonwidth = allocation->width;
- buttonheight = allocation->height-hsync;
- hsync=0;
- /*
- * gtk_container_children() brought to me by PaxAnima. Thanks.
- * It looks like in GTK2, this function is called
- * gtk_container_get_children().
- */
- if (gtk_container_children (GTK_CONTAINER (login_bg_file_button)) == NULL) {
- login_bg_pixmap = gpe_create_pixmap (controlvbox1, login_bg_filename,
- buttonwidth,
- buttonheight);
- gtk_container_add (GTK_CONTAINER (login_bg_file_button), login_bg_pixmap);
- gtk_widget_show (GTK_WIDGET (login_bg_pixmap));
- }
-}
-
-
void
update_login_lock (GtkWidget *togglebutton,gpointer user_data)
{