[Fedora-directory-commits] CVSROOT avail, 1.1, 1.2 dolog.pl, 1.1, 1.2 loginfo, 1.10, 1.11
by Doctor Conrad
Author: katzj
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32499
Modified Files:
avail dolog.pl loginfo
Log Message:
add wtogami and myself to CVSROOT committers, try to fix commit mail
Index: avail
===================================================================
RCS file: /cvs/dirsec/CVSROOT/avail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avail 15 Apr 2005 15:43:19 -0000 1.1
+++ avail 15 Sep 2006 15:32:18 -0000 1.2
@@ -13,5 +13,5 @@
# Lock down the CVSROOT directory so ACLs make sense
unavail | | CVSROOT
# Access to all files to policy setters
-avail | foxworth,sopwith | CVSROOT
+avail | katzj,wtogami | CVSROOT
# trusted developers that can add modules
Index: dolog.pl
===================================================================
RCS file: /cvs/dirsec/CVSROOT/dolog.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dolog.pl 20 Apr 2006 00:20:32 -0000 1.1
+++ dolog.pl 15 Sep 2006 15:32:18 -0000 1.2
@@ -1,4 +1,4 @@
-#! /webtools/tools/perl5/bin/perl
+#! /usr/bin/perl
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# The contents of this file are subject to the Netscape Public
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- loginfo 20 Apr 2006 00:26:00 -0000 1.10
+++ loginfo 15 Sep 2006 15:32:18 -0000 1.11
@@ -26,6 +26,5 @@
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec(a)fedora.redhat.com
-^ldapserver $CVSROOT/CVSROOT/dolog.pl -r /cvs/dirsec foxworth(a)redhat.com
ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com
ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes(a)fedoraproject.org
17 years, 7 months
[Fedora-directory-commits] esc/src/lib/notifytray config.mk, NONE, 1.1 Makefile, NONE, 1.1 manifest.mn, NONE, 1.1 notifyareaicon.c, NONE, 1.1 notifyareaicon.h, NONE, 1.1 notify.def, NONE, 1.1 notifytray.c, NONE, 1.1 notifytray.h, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/notifytray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16017
Added Files:
config.mk Makefile manifest.mn notifyareaicon.c
notifyareaicon.h notify.def notifytray.c notifytray.h
Log Message:
Initial revision.
--- NEW FILE config.mk ---
# ***** BEGIN COPYRIGHT BLOCK *****
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# ***** END COPYRIGHT BLOCK *****
TARGETS = $(LIBRARY)
#SHARED_LIBRARY =
#IMPORT_LIBRARY =
#PROGRAM =
--- NEW FILE Makefile ---
#! gmake
#
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#######################################################################
# (1) Include initial platform-independent assignments (MANDATORY). #
#######################################################################
include manifest.mn
#######################################################################
# (2) Include "global" configuration information. (OPTIONAL) #
#######################################################################
include $(CORE_DEPTH)/coreconf/config.mk
#######################################################################
# (3) Include "component" configuration information. (OPTIONAL) #
#######################################################################
DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\"
DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
#######################################################################
# (4) Include "local" platform-dependent assignments (OPTIONAL). #
#######################################################################
include config.mk
ifeq ($(HAVE_LIB_NOTIFY),1)
CFLAGS += -DHAVE_LIB_NOTIFY
endif
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################
include $(CORE_DEPTH)/coreconf/rules.mk
#######################################################################
# (6) Execute "component" rules. (OPTIONAL) #
#######################################################################
#######################################################################
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
pig:
echo "HAVE_LIB_NOTIFY" $(HAVE_LIB_NOTIFY)
echo "CFLAGS" + $(CFLAGS)
--- NEW FILE manifest.mn ---
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
CORE_DEPTH = ../../..
DEFINES += $(shell pkg-config --cflags gtk+-2.0)
CCFLAGS += $(shell pkg-config --libs gtk+-2.0)
CCFLAGS += $(shell pkg-config --cflags glib-2.0)
ifeq ($(HAVE_LIB_NOTIFY),1)
LDFLAGS += $(shell pkg-config --libs libnotify)
REQUIRES = libnotify
endif
MODULE = traynotify
LIBRARY_NAME = $(MODULE)
MAPFILE = $(OBJDIR)/notify.def
CSRCS = \
notifytray.c \
notifyareaicon.c \
$(NULL)
EXPORTS = \
notifytray.h \
$(NULL)
--- NEW FILE notifyareaicon.c ---
/** BEGIN COPYRIGHT BLOCK
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <string.h>
#include <gdk/gdkx.h>
#include "notifyareaicon.h"
#define SYSTEM_TRAY_REQUEST_DOCK 0
#define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2
static void notify_area_icon_class_init(NotifyAreaIconClass *theClass);
static void notify_area_icon_init(NotifyAreaIcon *icon);
static void notify_area_icon_unrealize (GtkWidget *widget);
static void notify_area_icon_update_manager_wnd (NotifyAreaIcon *icon);
static GtkPlugClass *plug_parent_class = NULL;
GType
notify_area_icon_get_type (void)
{
static GType my_type = 0;
my_type = g_type_from_name("CoolKeyTrayIcon");
if (my_type == 0)
{
static const GTypeInfo my_info =
{
sizeof (NotifyAreaIconClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) notify_area_icon_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (NotifyAreaIcon),
0, /* n_preallocs */
(GInstanceInitFunc) notify_area_icon_init
};
my_type = g_type_register_static (GTK_TYPE_PLUG, "CoolKeyTrayIcon", &my_info,(GTypeFlags) 0);
}
else
{
if (plug_parent_class == NULL) {
notify_area_icon_class_init((NotifyAreaIconClass *)g_type_class_peek(my_type));
}
}
return my_type;
}
static void
notify_area_icon_init (NotifyAreaIcon *icon)
{
icon->counter = 1;
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
static void
notify_area_icon_class_init (NotifyAreaIconClass *theClass)
{
GtkWidgetClass *widget_klass = (GtkWidgetClass *)theClass;
plug_parent_class = (GtkPlugClass *) g_type_class_peek_parent (theClass);
widget_klass->unrealize = notify_area_icon_unrealize;
}
static void
notify_area_icon_unrealize (GtkWidget *widget)
{
NotifyAreaIcon *icon = (NotifyAreaIcon *) widget;
GdkWindow *root_window;
g_print("notify_area_icon_unrealize \n");
if (icon->manager_wnd != None)
{
GdkWindow *gdkwin;
gdkwin = gdk_window_lookup (icon->manager_wnd);
}
root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
if (GTK_WIDGET_CLASS (plug_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (plug_parent_class)->unrealize) (widget);
}
static void
notify_area_icon_send_manager_msg (NotifyAreaIcon *icon,
long message,
Window window,
long data1,
long data2,
long data3)
{
XClientMessageEvent ev;
Display *display;
g_print("notify_area_icon_send_manager_msg \n");
ev.type = ClientMessage;
ev.window = window;
ev.message_type = icon->system_tray_opcode_atom;
ev.format = 32;
ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
ev.data.l[1] = message;
ev.data.l[2] = data1;
ev.data.l[3] = data2;
ev.data.l[4] = data3;
display = gdk_display;
gdk_error_trap_push ();
XSendEvent (display,
icon->manager_wnd, False, NoEventMask, (XEvent *)&ev);
XSync (display, False);
gdk_error_trap_pop ();
}
static void
notify_area_icon_send_dock_request (NotifyAreaIcon *icon)
{
g_print("notify_area_icon_send_dock_request \n");
notify_area_icon_send_manager_msg (icon,
SYSTEM_TRAY_REQUEST_DOCK,
icon->manager_wnd,
gtk_plug_get_id (GTK_PLUG (icon)),
0, 0);
}
static void
notify_area_icon_update_manager_wnd(NotifyAreaIcon *icon)
{
Display *xdisplay;
xdisplay = gdk_display;
if (icon->manager_wnd != None)
{
GdkWindow *gdkwin;
gdkwin = gdk_window_lookup (icon->manager_wnd);
}
XGrabServer (xdisplay);
icon->manager_wnd = XGetSelectionOwner (xdisplay, icon->selection_atom);
if (icon->manager_wnd != None)
XSelectInput (xdisplay,
icon->manager_wnd, StructureNotifyMask);
XUngrabServer (xdisplay);
XFlush (xdisplay);
if (icon->manager_wnd != None)
{
GdkWindow *gdkwin;
gdkwin = gdk_window_lookup (icon->manager_wnd);
g_print("update_manager_wnd gdkwin %p \n",gdkwin);
/* Send dock request */
notify_area_icon_send_dock_request (icon);
}
}
NotifyAreaIcon *
notify_area_icon_new(const gchar *name)
{
NotifyAreaIcon *icon;
char buff[256];
GdkWindow *root;
Screen *xscreen = DefaultScreenOfDisplay (gdk_display);
g_return_val_if_fail (xscreen != NULL,NULL);
g_print("notify_area_icon_new_for_xscreen \n");
icon = (NotifyAreaIcon *) g_object_new(notify_area_icon_get_type ()
, NULL);
gtk_window_set_title (GTK_WINDOW (icon), name);
gtk_plug_construct (GTK_PLUG (icon), 0);
gtk_widget_realize (GTK_WIDGET (icon));
g_snprintf (buff, sizeof (buff),
"_NET_SYSTEM_TRAY_S%d",
XScreenNumberOfScreen (xscreen));
icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
buff, False);
icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
"_NET_SYSTEM_TRAY_OPCODE", False);
notify_area_icon_update_manager_wnd(icon);
root = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
icon->tooltips = gtk_tooltips_new ();
return icon;
}
guint
notify_area_icon_send_msg (NotifyAreaIcon *icon,
gint timeout,
const char *message,
gint msg_len)
{
guint counter;
g_print("notify_area_tray_icon_send_msg \n");
g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0);
if (icon->manager_wnd == None)
return 0;
int len = strlen(message);
counter = icon->counter++;
notify_area_icon_send_manager_msg (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
(Window)gtk_plug_get_id (GTK_PLUG (icon)),
timeout, len, counter);
int message_chunk_size = 20;
gdk_error_trap_push ();
/* Send the message in chunks of 20*/
while (len > 0)
{
XClientMessageEvent ev;
Display *xdisplay;
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
ev.type = ClientMessage;
ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
ev.message_type = XInternAtom (xdisplay,
"_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
if (len > message_chunk_size)
{
memcpy ((char *)&ev.data, message, message_chunk_size);
len -= message_chunk_size;
message += message_chunk_size;
}
else
{
memcpy ((char *)&ev.data, message, len);
len = 0;
}
XSendEvent (xdisplay,
icon->manager_wnd, False, StructureNotifyMask, (XEvent *)&ev);
XSync (xdisplay, False);
}
gdk_error_trap_pop ();
return counter;
}
--- NEW FILE notifyareaicon.h ---
/** BEGIN COPYRIGHT BLOCK
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _NOTIFY_AREA_ICON_H
#define _NOTIFY_AREA_ICON_H
#include <gtk/gtkplug.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
G_BEGIN_DECLS
struct _NotifyAreaIcon
{
GtkPlug parent;
guint counter;
Atom selection_atom;
Atom system_tray_opcode_atom;
Window manager_wnd;
GtkTooltips *tooltips;
};
struct _NotifyAreaIconClass
{
GtkPlugClass parent_class;
};
typedef struct _NotifyAreaIcon NotifyAreaIcon;
typedef struct _NotifyAreaIconClass NotifyAreaIconClass;
extern NotifyAreaIcon *notify_area_icon_new(const gchar *name);
guint notify_area_icon_send_msg(NotifyAreaIcon *icon,
gint timeout,
const char *msg,
gint length);
GType notify_area_icon_get_type (void);
G_END_DECLS
#endif /* NOTIFY_AREA_ICON_H */
--- NEW FILE notify.def ---
;+NOTIFY_1.0 { # NOTIFY release 1.0
;+ global:
LIBRARY notify ;-
EXPORTS ;-
notify_icon_create;
notify_icon_create_with_image_file;
notify_icon_destroy;
notify_icon_created_ok;
;+ local:
;+ *;
;+};
--- NEW FILE notifytray.c ---
/** BEGIN COPYRIGHT BLOCK
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <gtk/gtk.h>
#include <stdlib.h>
#include "notifyareaicon.h"
#include "notifytray.h"
#include "string.h"
#ifdef HAVE_LIB_NOTIFY
#include <libnotify/notify.h>
#endif
/* globals */
static NotifyAreaIcon *notify = NULL;
static GtkWidget *image = NULL;
static GdkPixbuf *blank_icon = NULL;
static GtkWidget *notify_menu = NULL;
static char *notify_image = NULL;
static GtkWidget *notify_box = NULL;
GtkWidget *notify_icon_get_box_widget()
{
return notify_box;
}
void
notify_icon_embedded_cb(GtkWidget *widget, void *data)
{
g_print ("notify_icon_embedded_cb\n");
}
void
notify_icon_destroyed_cb(GtkWidget *widget, void *data)
{
g_print ("notify_icon_destroyed_cb\n");
g_object_unref(G_OBJECT(notify));
notify = NULL;
}
void
notify_icon_clicked_cb_local(GtkWidget *button, GdkEventButton *event, void *data)
{
g_print ("notify_icon_clicked_cb_local.\n");
if(notify_menu)
{
g_print("trying to create popup menu. \n");
gtk_menu_popup(GTK_MENU(notify_menu),
NULL,
NULL,
NULL,
NULL,
event->button,
event->time);
}
if (event->type != GDK_BUTTON_PRESS)
return;
}
void
notify_icon_destroy()
{
g_print ("notify_icon_destroy\n");
if(notify == NULL)
{
return;
}
g_signal_handlers_disconnect_by_func(G_OBJECT(notify),(void *) G_CALLBACK(notify_icon_destroyed_cb),NULL);
gtk_widget_destroy(GTK_WIDGET(notify));
g_object_unref(G_OBJECT(notify));
notify = NULL;
if (blank_icon)
g_object_unref(G_OBJECT(blank_icon));
blank_icon = NULL;
}
void notify_icon_create_with_image_file(char *image_file)
{
if(notify_image)
{
free(notify_image);
notify_image = NULL;
}
notify_image = strdup(image_file);
notify_icon_create();
}
void
notify_icon_create()
{
if (notify) {
return;
}
notify = notify_area_icon_new("coolkey");
if(!notify_box)
{
notify_box = gtk_event_box_new();
}
if(notify_image)
{
g_print("about to create image from file %s \n",notify_image);
image = gtk_image_new_from_file(notify_image);
}
g_signal_connect(G_OBJECT(notify), "embedded", G_CALLBACK(notify_icon_embedded_cb), NULL);
g_signal_connect(G_OBJECT(notify), "destroy", G_CALLBACK(notify_icon_destroyed_cb), NULL);
gtk_container_add(GTK_CONTAINER(notify_box), image);
gtk_container_add(GTK_CONTAINER(notify), notify_box);
if(!gtk_check_version(2,4,0))
g_object_set(G_OBJECT(notify_box), "visible-window", FALSE, NULL);
gtk_widget_show_all(GTK_WIDGET(notify));
/* reference the icon */
g_object_ref(G_OBJECT(notify));
}
int notify_icon_created_ok()
{
if(!notify)
return 0;
if(notify->manager_wnd)
return 1;
else
return 0;
}
int notify_icon_show()
{
if(!notify)
return 0;
gtk_widget_show(GTK_WIDGET(notify));
return 1;
}
int notify_icon_hide()
{
if(!notify)
return 0;
gtk_widget_hide(GTK_WIDGET(notify));
return 1;
}
void notify_icon_set_static_tooltip(const gchar *message)
{
if(!message || !notify)
return;
if(notify->tooltips)
{
gtk_tooltips_set_tip (notify->tooltips, GTK_WIDGET(notify), message, NULL);
}
}
void notify_icon_send_tooltip_msg(const gchar *title,const gchar *message,gint severity,gint timeout,const char* icon)
{
if(!message || !notify)
return;
gchar *msg_title = NULL;
if(!title)
msg_title = "Notification";
else
msg_title = title;
gint msg_timeout = 3000;
if(timeout > 0 && timeout < 10000)
msg_timeout = timeout;
#ifdef HAVE_LIB_NOTIFY
if(!notify_is_initted())
{
notify_init ("ESC");
}
g_print("icon %s", icon);
NotifyNotification *not = notify_notification_new(msg_title, message,icon, GTK_WIDGET(notify));
if(not)
{
notify_notification_set_timeout (not, msg_timeout);
if(!notify_notification_show (not, NULL))
{
g_print ("problem showing notification");
}
g_object_unref(G_OBJECT(not));
}
else
{
g_print ("problem creating notification object!\n");
}
#endif
}
--- NEW FILE notifytray.h ---
/** BEGIN COPYRIGHT BLOCK
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _NOTIFY_TRAY_H_
#define _NOTIFY_TRAY_H_
extern GtkWidget *notify_icon_get_box_widget();
extern void notify_icon_create();
extern void notify_icon_create_with_image_file(char *image_file_name);
extern void notify_icon_destroy();
extern int notify_icon_created_ok();
extern int notify_icon_show();
extern int notify_icon_hide();
extern void notify_icon_set_static_tooltip(const char *message);
extern void notify_icon_send_tooltip_msg(const char *title,const char *message,gint severity,gint timeout,const char *icon);
#endif /* _NOTIFY_TRAY_H_ */
17 years, 7 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc AdvancedInfo.js, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13121
Added Files:
AdvancedInfo.js
Log Message:
Initial revision.
--- NEW FILE AdvancedInfo.js ---
/** BEGIN COPYRIGHT BLOCK
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
function ShowAdvancedInfo()
{
var dump = window.arguments[0];
var frame = window.document.getElementById("advanced-info");
var doco = frame.contentDocument;
if(doco)
{
doco.open();
doco.write(dump);
doco.close();
}
}
17 years, 7 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc hiddenWindow.xul, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13068
Added Files:
hiddenWindow.xul
Log Message:
Initial revision.
--- NEW FILE hiddenWindow.xul ---
<?xml version="1.0"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* 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; version 2 of the License.
*
* 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
*
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
***** END COPYRIGHT BLOCK ***** -->
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
id="esc-window"
title="&escTitle;"
onload="hiddenWindowStartup();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
<script src="TRAY.js"/>
<script src="ESC.js"/>
</window>
17 years, 7 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc 1-none.png, NONE, 1.1 2-vweak.png, NONE, 1.1 3-weak.png, NONE, 1.1 4-fair.png, NONE, 1.1 5-good.png, NONE, 1.1 6-strong.png, NONE, 1.1 blank-card.png, NONE, 1.1 blank-cardx2.png, NONE, 1.1 enrolled-key.png, NONE, 1.1 enrolled-keyx2.png, NONE, 1.1 enroll.png, NONE, 1.1 enrollx2.png, NONE, 1.1 esc-client-24.png, NONE, 1.1 esc.png, NONE, 1.1 formatcard.png, NONE, 1.1 formatcardx2.png, NONE, 1.1 initializecard.png, NONE, 1.1 initializecardx2.png,
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13014
Added Files:
1-none.png 2-vweak.png 3-weak.png 4-fair.png 5-good.png
6-strong.png blank-card.png blank-cardx2.png enrolled-key.png
enrolled-keyx2.png enroll.png enrollx2.png esc-client-24.png
esc.png formatcard.png formatcardx2.png initializecard.png
initializecardx2.png
Log Message:
Initial revison
17 years, 7 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.1.1.1, 1.2 GenericAuth.js, 1.1.1.1, 1.2 TRAY.js, 1.1.1.1, 1.2 certinfo.xul, 1.1.1.1, 1.2 config.xul, 1.1.1.1, 1.2 esc.css, 1.1.1.1, 1.2 esc.xul, 1.1.1.1, 1.2 esc_browser.xul, 1.1.1.1, 1.2 settings.xul, 1.1.1.1, 1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12965
Modified Files:
ESC.js GenericAuth.js TRAY.js certinfo.xul config.xul esc.css
esc.xul esc_browser.xul settings.xul
Log Message:
Update to Latest.
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1.1.1 -r 1.2 ESC.js
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ESC.js 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ ESC.js 13 Sep 2006 17:56:49 -0000 1.2
@@ -20,21 +20,42 @@
var gStringBundle = null;
var netkey;
-var gHidden = null;
-
var keyUITable = new Array();
var keyTypeTable = new Array();
var curChildWindow = null;
-var gUsesTree = 0;
+var gEnrollmentPage = 0;
+var gAdminPage = 0;
+var gUsesListBox = 0;
+var gFactoryMode = 0;
+var gHiddenPage = 0;
+var gHiddenPageDone = 0;
+var gExternalUI = 0;
+
+var gDiagnosticsCopyString=null;
loadStringBundle();
+//ESC constants
+
+const KEY_ISSUER_URL = "keyIssuerUrl";
+const KEY_ISSUER = "keyIssuer";
+const TPS_URL = "Operation";
+const TPS_UI = "UI";
+const SERVICES_TAG = "Services";
+const ISSUER_TAG = "IssuerName";
+const SERVICE_INFO_TAG = "ServiceInfo";
+
+//Window names
+
+const ENROLL_WINDOW = "esc.xul";
+const ADMIN_WINDOW = "settings.xul";
+const HIDDEN_WINDOW = "hiddenWindow.xul";
+
function getUIForKey(aKeyID)
{
return keyUITable[aKeyID];
-
}
function getTypeForKey(aKeyID)
@@ -60,7 +81,7 @@
if(!iid.equals(Components.interfaces.rhIKeyNotify) &&
!iid.equals(Components.interfaces.nsISupports))
{
- alert(getBundleString("errorJsNotifyInterface"));
+ MyAlert(getBundleString("errorJsNotifyInterface"));
throw Components.results.NS_ERROR_NO_INTERFACE;
}
return this;
@@ -77,7 +98,7 @@
gNotify = new jsNotify;
netkey.rhCoolKeySetNotifyCallback(gNotify);
} catch(e) {
- alert(getBundleString("errorUniversalXPConnect") + e);
+ MyAlert(getBundleString("errorUniversalXPConnect") + e);
}
//
@@ -86,13 +107,14 @@
function cleanup()
{
- TrayRemoveWindow();
+ TrayRemoveWindow(null);
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
netkey.rhCoolKeyUnSetNotifyCallback(gNotify);
} catch(e) {
- alert(getBundleString("errorUniversalXPConnect") + e);
+ MyAlert(getBundleString("errorUniversalXPConnect") + e);
}
+
}
var gScreenName = "";
@@ -181,7 +203,7 @@
} catch(e) {
- alert(getBundleString("errorConfigValue") + e);
+ MyAlert(getBundleString("errorConfigValue") + e);
}
if(tps_uri)
@@ -193,6 +215,102 @@
}
+function DoPhoneHome(keyType,keyID)
+{
+ var callback = function (aResult) {
+
+ if(aResult == true)
+ {
+ UpdateRowWithPhoneHomeData(keyType,keyID);
+ }
+ else
+ {
+ launchCONFIG(keyType,keyID);
+ }
+ }
+
+ if(IsPhoneHomeCached(keyID))
+ {
+ return true;
+ }
+
+ var home = DoCoolKeyGetIssuerUrl(keyType,keyID);
+
+ var homeRes = false;
+
+ if(home)
+ {
+ homeRes = phoneHome(home,keyID,callback);
+ }
+
+ if(!homeRes)
+ {
+ launchCONFIG(keyType,keyID);
+ }
+
+ return homeRes;
+}
+//Test Phone Home url in config UI
+
+function DoPhoneHomeTest()
+{
+ // Test out user supplied phone home url
+
+ var name = this.name;
+
+ var callback = function (aResult) {
+
+ if(aResult == true)
+ {
+ MyAlert(getBundleString("tpsConfigSuccess"));
+ }
+ else
+ {
+ MyAlert(getBundleString("tpsConfigError"));
+ }
+ }
+
+ var url = document.getElementById("phonehomeuri");
+
+ if(!url)
+ {
+ MyAlert(getBundleString("noTpsConfigUrl"));
+ return;
+
+ }
+
+ if(!url.value)
+ {
+ MyAlert(getBundleString("noTpsConfigUrl"));
+ return;
+ }
+
+ MyAlert(getBundleString("tpsConfigTest") + " " + url.value);
+
+ if(name)
+ {
+ phoneHome(url.value,name,callback);
+ }
+ else
+ {
+ MyAlert(getBundleString("tpsConfigError"));
+ }
+
+}
+
+function DoPhoneHomeConfigClose()
+{
+
+ var name = this.name;
+
+ if(window.opener && name)
+ {
+ window.opener.UpdateRowWithPhoneHomeData(1,name);
+ }
+
+ window.close();
+}
+
//Test the tps uri connection
[...3381 lines suppressed...]
+ return false;
+ }
+ var root = response.getElementsByTagName("ServiceInfo");
+
+ if(!root)
+ {
+ if(resultCB)
+ resultCB(false);
+ return false;
+ }
+
+ var issuer = response.getElementsByTagName("IssuerName").item(0);
+
+ if(!issuer)
+ {
+ if(resultCB)
+ resultCB(false);
+ return false;
+ }
+
+ var theIssuer = issuer.lastChild.data;
+
+ if(theIssuer)
+ {
+ var issuer_config_value = ConfigValueWithKeyID(aKeyID,KEY_ISSUER);
+ if(issuer_config_value)
+ {
+ DoCoolKeySetConfigValue(issuer_config_value,theIssuer);
+
+ }
+ }
+
+ var services = response.getElementsByTagName("Services");
+
+ if(!services)
+ {
+ if(resultCB)
+ resultCB(false);
+ return false;
+ }
+
+ var servicesNodes = services[0].childNodes;
+ var len = servicesNodes.length;
+
+ for (var i = 0; i < len; i++)
+ {
+ var oChild = servicesNodes.item(i);
+ var name = oChild.nodeName;
+ var value = oChild.firstChild.data;
+
+ if(name && value)
+ {
+ var cValue = ConfigValueWithKeyID(aKeyID,name);
+
+ if(cValue)
+ {
+ DoCoolKeySetConfigValue(cValue,value);
+ }
+ }
+
+ }
+
+ if(resultCB)
+ {
+ //Manually write out entry for phone home url
+
+ var issuer_config_value = ConfigValueWithKeyID(aKeyID,KEY_ISSUER_URL);
+ var result = DoCoolKeySetConfigValue(issuer_config_value,url);
+ resultCB(true);
+ }
+ return;
}
+ }
- }
+ req.onreadystatechange = callback;
+ req.send(null);
+
+ return true;
+}
+
+function ReadESCLog()
+{
+
+ const logFileName = "esc.log";
+
+ // Get executable directory
+
+ var file = Components.classes["@mozilla.org/file/directory_service;1"]
+ .getService(Components.interfaces.nsIProperties)
+ .get("ProfD", Components.interfaces.nsIFile);
+
+ file = file.parent;
+ file.append(logFileName);
+ var istream = Components.classes["@mozilla.org/network/file-input-stream;1"]
+ .createInstance(Components.interfaces.nsIFileInputStream);
+
+ try {
+ istream.init(file, 0x01, 0444, 0);
+ istream.QueryInterface(Components.interfaces.nsILineInputStream);
+
+ } catch (e){
+
+ return null;
+ }
+
+ // read lines into array
+ var line = {}, lines = [], hasmore;
+ do {
+ hasmore = istream.readLine(line);
+
+ var value = line.value;
+
+ var colonIndex = value.indexOf(":");
+
+ value = value.substring(colonIndex + 1);
+
+ lines.push(value);
+ } while(hasmore);
+
+ istream.close();
+
+ return lines;
+
+}
+
+// Get the url form of the balloon tooltip icon
+// Only useful on Linux
+
+function GetESCNotifyIconPath(keyType,keyID)
+{
+ var path = null;
+ var def_image = "/components/icon.png";
+
+ var chrome_path = "/chrome/content/esc/";
+ var image = null;
+
+ var status;
+
+ try {
+ status = GetCoolKeyStatus(keyType, keyID);
+ } catch(e) {
+ status = 0;
+ }
+
+ if(status == 1) // no applet
+ {
+ image = chrome_path + "blank-card.png";
+ }
+ if(status == 2) // uninitialized
+ {
+ image = chrome_path + "initializecard.png";
+ }
+ if(status == 4) // enrolled
+ {
+ image = chrome_path + "enrolled-key.png";
+ }
+
+ if(!image)
+ image = def_image;
+
+ var file = Components.classes["@mozilla.org/file/directory_service;1"]
+ .getService(Components.interfaces.nsIProperties)
+ .get("CurProcD", Components.interfaces.nsIFile);
+
+ if(file)
+ file = file.parent;
+
+ if(file.path)
+ path = "file://" + file.path + image;
+
+ return path;
+}
+
+// New Alert Functions based on nsIPromptService
+
+function MyAlert(message)
+{
+ if(message)
+ DoMyAlert(message,getBundleString("escTitle"));
+}
+
+function DoMyAlert(message,title)
+{
+
+ if(!message || !title)
+ return; try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
+
+ prompts.alert(window,title,message);
+
+ } catch(e) {
+
+
+ alert("Problem with nsIPromptService " + e);
+ }
}
Index: GenericAuth.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- GenericAuth.js 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ GenericAuth.js 13 Sep 2006 17:56:49 -0000 1.2
@@ -430,6 +430,18 @@
return text_node;
}
+function AddSpacer()
+{
+ var tSpacer = document.createElement("spacer");
+
+ if(!tSpacer)
+ return null;
+
+
+ return tSpacer;
+
+}
+
function AddButton(id,label)
{
@@ -586,9 +598,15 @@
if(last_row)
{
+ AddSpacerToNode(last_row,"1","min-height: 20px");
+ AddSpacerToNode(last_row,"1","min-height: 20px");
var button = AddButton("","Submit");
- button.setAttribute("oncommand" , "FormSubmit();");
- last_row.appendChild(button);
+ if(button)
+ button.setAttribute("oncommand" , "FormSubmit();");
+
+
+ if(button)
+ last_row.appendChild(button);
}
}
Index: TRAY.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/TRAY.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- TRAY.js 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ TRAY.js 13 Sep 2006 17:56:49 -0000 1.2
@@ -23,9 +23,40 @@
var gBaseWindow = 0;
+var gWindNotify = null;
+
loadStringBundle();
+//
+// Tray event Notify callback
+//
+function jsWindNotify() {}
+
+jsWindNotify.prototype = {
+
+ rhTrayWindEventNotify: function(aEvent,aEventData,aKeyData,aData1,aData2)
+ {
+ //alert("rhTrayWindEventNotify!!!! event " + aEvent);
+
+ NotifyESCOfTrayEvent(aEvent,aEventData,aKeyData,aData1,aData2);
+ },
+
+ QueryInterface: function(iid)
+ {
+ //alert("iid: " + iid);
+ if(!iid.equals(Components.interfaces.rhITrayWindNotify) &&
+ !iid.equals(Components.interfaces.nsISupports))
+ {
+ MyAlert(getBundleString("errorJsNotifyInterface"));
+ throw Components.results.NS_ERROR_NO_INTERFACE;
+ }
+ return this;
+ }
+};
+
+
+
//Initialize tray XPCOM object
// GECKO ONLY initialization
@@ -39,10 +70,20 @@
gBaseWindow = getBaseWindow();
+ if(gTray)
+ {
+ gWindNotify = new jsWindNotify;
+ if(gWindNotify)
+ gTray.setwindnotifycallback(gWindNotify);
+
+ //alert("setting tray notify callback " + gWindNotify);
+ }
+
} catch(e) {
-}
+ MyAlert("e " + e);
+}
TrayAddWindow();
@@ -92,7 +133,7 @@
}
catch (ex)
{
- alert(getBundleString("errorTrayIsInitialized"));
+ MyAlert(getBundleString("errorTrayIsInitialized"));
rv = null;
/* ignore no-interface exception */
}
@@ -115,7 +156,7 @@
gTray.showall();
} catch(e) {
- alert(getBundleString("errorShowAllWindows") + e);
+ MyAlert(getBundleString("errorShowAllWindows") + e);
return;
}
@@ -135,7 +176,7 @@
gTray.hideall();
} catch(e) {
- alert(getStringBundle("errorHideAllWindows") + e);
+ MyAlert(getStringBundle("errorHideAllWindows") + e);
return;
}
@@ -156,7 +197,7 @@
gTray.show(gBaseWindow);
} catch(e) {
- alert(getBundleString("errorShowWindow"));
+ MyAlert(getBundleString("errorShowWindow"));
return;
}
@@ -176,30 +217,50 @@
gTray.hide(gBaseWindow);
} catch(e) {
- alert(getBundleString("errorHideWindow"));
+ MyAlert(getBundleString("errorHideWindow"));
return;
}
}
-function TrayRemoveWindow()
+function TrayRemoveWindowNotify()
{
- if(gTray && gBaseWindow)
+ if(gTray && gBaseWindow && gWindNotify)
{
-
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+ gTray.unsetwindnotifycallback(gWindNotify);
+
+
+ } catch(e) {
+ return;
+ }
+
+
+ }
+}
+
+function TrayRemoveWindow(doPreserveNotifyCallback)
+{
+ if(gTray && gBaseWindow)
+ {
+ try {
+
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
gTray.remove(gBaseWindow);
} catch(e) {
- alert(getBundleString("errorRemoveWindow") + e);
+ MyAlert(getBundleString("errorRemoveWindow") + e);
return;
}
+ if(gWindNotify && !doPreserveNotifyCallback)
+ gTray.unsetwindnotifycallback(gWindNotify);
}
}
@@ -226,38 +287,88 @@
}
+}
+function TraySendNotificationMessage(aTitle,aMessage,aSeverity,aTimeout,aIcon)
+{
+ if(!gHiddenPage)
+ return;
+
+ if(gTray && gBaseWindow)
+ {
+ try {
-}
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
-function TraySendNotificationMessage(aMessage)
-{
+ gTray.sendnotification(aTitle,aMessage,aSeverity,aTimeout,aIcon);
- if(gTray && gBaseWindow)
+ } catch(e) {
+ alert(getBundleString("errorTrayNotification") + e);
+ return;
+ }
+
+ }
+
+}
+
+
+function TrayHideNotificationIcon()
{
+ if(!gHiddenPage)
+ return;
- try {
+ if(gTray && gBaseWindow)
+ {
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
- gTray.sendnotification(aMessage);
+ gTray.hideicon();
} catch(e) {
- alert(getBundleString("errorTrayNotification") + e);
return;
}
+ }
}
+function TrayLoadedOK()
+{
+ var result = 0;
+ if(gTray)
+ result = 1;
+ return result;
+}
+
+function TrayShowNotificationIcon()
+{
+ if(!gHiddenPage)
+ return;
+
+ if(gTray && gBaseWindow)
+ {
+
+ try {
+
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ gTray.settooltipmsg(getBundleString("escTitle"));
+ gTray.showicon();
+
+ } catch(e) {
+ return;
+ }
+
+ }
}
+
//String bundling related functions
function loadStringBundle()
@@ -267,7 +378,6 @@
function getBundleString(string_id)
{
-
var str = null;
if(!string_id || !gStringBundle)
@@ -276,6 +386,5 @@
str = gStringBundle.getString(string_id);
return str;
-
}
Index: certinfo.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/certinfo.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- certinfo.xul 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ certinfo.xul 13 Sep 2006 17:56:49 -0000 1.2
@@ -20,7 +20,7 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
class="escwindow"
- id="esc-cert-window"
+ id="esc-window"
onload="ShowCertInfo();"
onunload="cleanup();"
title="&certInfoTitle;"
Index: config.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/config.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.xul 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ config.xul 13 Sep 2006 17:56:49 -0000 1.2
@@ -20,9 +20,9 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
class="escwindow"
- id="esc-config-window"
+ id="esc-window"
title="&escTitle;"
- onload="InitializeConfigUI()"
+ onload="InitializePhoneHomeConfigUI();"
width ="600"
height= "350"
onunload="cleanup();"
@@ -30,33 +30,21 @@
<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
<script src="TRAY.js"/>
<script src="ESC.js"/>
- <toolbox flex="0">
- <toolbar id="esc-menubar">
- <menu id="nav-menu" label="&navigationMenu;">
- <menupopup id="file-popup">
- <menuitem label="&enrollmentMenuItem;" oncommand="loadESC();"/>
- <menuitem label="&settingsMenuItem;" oncommand="loadSETTINGS();"/>
- </menupopup>
- </menu>
- </toolbar>
- </toolbox>
-
- <groupbox>
-<hbox >
+<hbox class="logoBox" >
<image id="logoImage"/>
- <spacer flex="1"/>
+ <spacer class="horSpacerVeryShort"/>
<label class = "headLabelText" value="&configTitle;"/>
<spacer flex="1"/>
</hbox>
-</groupbox>
<vbox flex="1" >
-
- <groupbox >
+ <description class="messageText">
+ &tpsConfigDesc;
+ </description>
+ <groupbox class="outerGroupBox" >
<caption label="&editConfigValues;"/>
<spacer flex="1" style="min-height: 10px" />
<grid id ="ConfigTable" >
<columns>
-
<column />
<column flex = "1" />
<column flex = "1" />
@@ -64,24 +52,16 @@
<rows id="ConfigTableRows">
<row pack="center">
<label class="titleText" value="&tpsURIHeader;" />
- <textbox size="70" class="configTextBox" id="tpsuri" value="" />
- <button id="testtpsurl" label="&doTest;" oncommand="testTPSURI(null);"/>
+ <textbox size="70" class="configTextBox" id="phonehomeuri" value="" />
+ <button class="mediumButon" id="testtpsurl" label="&doTest;" oncommand="DoPhoneHomeTest();"/>
</row>
-
- <row pack="center">
- <label class="titleText" value = "&escEnrollURIHeader;" />
- <textbox size="70" class="configTextBox" id="tpsenrolluri" value="" />
- <button id="testenrollurl" label="&doTest;" oncommand="testEnrollURI();"/>
- </row>
-
- <row>
- <button id="commitconfig" label= "&updateValues;" oncommand="commitConfigValues();"/>
- </row>
-
</rows>
-
</grid>
+ <hbox>
+ <spacer flex ="1"/>
+ <button label="&escOK;" oncommand="DoPhoneHomeConfigClose();" />
+ </hbox>
<spacer flex="1" style="min-height: 20px" />
</groupbox>
Index: esc.css
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- esc.css 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ esc.css 13 Sep 2006 17:56:49 -0000 1.2
@@ -15,11 +15,27 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+p {
+
+ font-style: italic;
+}
+
+.invisibleWindow {
+
+ visibility: hidden ;
+
+}
.escwindow {
background: #ffffff url(bg.jpg) repeat-x;
font-family: arial;
font-size: 17pt;
+ padding: 10px;
+}
+
+#smallKeyImage {
+
+ list-style-image: url(esc-client-24.png);
}
#logoImage {
@@ -27,13 +43,80 @@
list-style-image: url(logo.gif);
}
+#cylonImage {
+
+ list-style-image: url(progress.7.gif);
+}
+
+#blankKeyImage {
+
+ list-style-image: url(blank-card.png);
+}
+
+#uninitializedKeyImage {
+ list-style-image: url(initializecard.png);
+}
+
+#enrolledKeyImage {
+
+ list-style-image: url(enrolled-key.png);
+}
+
+#passwordNone {
+ list-style-image: url(1-none.png);
+}
+
* {
font-family: "Arial";
font-size: 8pt;
}
+
+.logoBox {
+ margin: 5px;
+ padding: 5px;
+
+}
+
+.outerBoxMedium {
+
+ padding: 5px;
+
+}
+.outerGroupBox {
+ padding: 7px;
+}
+
+.messageText {
+ font-size: 9pt;
+ text-align: justify;
+
+}
+
+.captionText {
+ font-size: 11pt;
+}
+
+.boldMessageText {
+ font-size: 1.3em;
+ font-weight: bold;
+ text-align: justify;
+
+}
+
+.largeLabelText {
+ font-size: 20pt;
+ font-weight:bold;
+}
+
+.mediumLabelText {
+ font-size: 12pt;
+ font-weight:bold;
+ text-align: center;
+}
+
.headLabelText {
- font-size: 13pt;
+ font-size: 17pt;
font-weight:bold;
text-align: center;
}
@@ -44,6 +127,12 @@
font-weight: bold;
}
+.largeLabelText {
+
+ font-size: 13pt;
+ font-weight:bold;
+}
+
.rowLabelTextUninit {
font-size: 8pt;
@@ -54,25 +143,45 @@
}
.rowLabelText {
-
font-size: 8pt;
- font-weight: bold;
-
+ font-weight: normal;
}
.headerText {
- font-family: "Arial";
font-size: 12pt;
font-weight: bold;
}
+.buttonText {
+ font-size: 10pt;
+}
+
.verticalSpacer {
- min-height: 20px;
+ min-height: 2.0em;
}
+.progressMeter {
+ margin: 4px;
+ width: 12px;
+}
+
+.verticalSpacerShort {
+ min-height: 1em;
+}
+
+
+.horSpacerShort {
+
+ min-width: 2em;
+}
+
+.horSpacerVeryShort {
+ min-width: 1em;
+}
+
.authTitleText {
text-align: left;
@@ -101,7 +210,7 @@
.linkText {
font-family: "Arial";
- font-size: 8pt;
+ font-size: 1.2em;
}
#BindingTable {
@@ -120,6 +229,10 @@
font-size: 7pt;
}
+tr [COOLKeyPresent="yes"]{
+ background-color: rgb(255, 0, 0);
+}
+
.cylon {
font-size: 4pt;
position: relative;
@@ -131,15 +244,12 @@
width: 200px;
height: 20px;
- align: center;
}
.cylonEye {
-
- align: center;
font-weight: bold;
- font-size: 9pt;
+ font-size: 4pt;
}
#statusMsg {
@@ -148,7 +258,7 @@
.ProgressMeter {
position: relative;
- padding: 0px;
+ padding: 1px;
border: 1px solid rgb(60, 60, 60);
background-color: #ffffff;
text-align: center;
@@ -172,42 +282,11 @@
}
-.KeyTableHeader {
- color: rgb(0,0, 0);
- background-color: #ffffff;
- text-align: left;
-}
-#KeyTable td {
- background-color: #ffffff;
- padding-left: 3px;
- padding-right: 3px;
-};
-
-.TableDescriptionPanel {
- background-color: #ffffff);
- margin-right: 5px;
- margin-left: 5px;
- margin-bottom: 0px;
- margin-bottom: 5px;
- padding: 5px;
-}
-
-.PurchasePanel {
- width: 100%;
- text-align: center;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
-.NeedQuestionText {
- font-size: 16pt;
- font-weight: bold;
-}
-
.COOLHeaderText {
font-family: "Arial";
- font-size: 20pt;
+ font-size: 17pt;
font-weight: bold;
+ vertical-align: middle;
}
.ContentTable {
@@ -230,24 +309,38 @@
.PageHeader {
width: 100%;
border-bottom: solid black 1px;
- vertical-align: center;
+ vertical-align: middle;
background-color: #ffffff;
}
-.Bordered {
+.BorderedIFrame {
- border: grey solid 7px;
+ width: 600px;
+ height: 725px;
+ border: black solid 4px;
}
.SelectedRow {
- background-color: grey;
+ color: white;
+ background-color: #0033CC;
}
.UnSelectedRow {
+ color: black;
background-color: #ffffff;
}
+
+.mediumButton {
+ width: 100px;
+}
+
+.mediumWideBox {
+
+ min-width: 20em;
+
+}
Index: esc.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- esc.xul 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ esc.xul 13 Sep 2006 17:56:49 -0000 1.2
@@ -22,104 +22,143 @@
class="escwindow"
id="esc-window"
title="&escTitle;"
- onload="InitializeBindingTable()"
- width ="500"
+ onload="InitializeEnrollment()"
+ width ="600"
height= "350"
onunload="cleanup()"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
-<script src= "TRAY.js"/>
-<script src="ESC.js"/>
- <toolbar id="enroll-esc-menubar">
- <menu id="enroll-nav-menu" label="&navigationMenu;">
- <menupopup id="enroll-file-popup">
- <menuitem label="&settingsMenuItem;" oncommand="loadSETTINGS();"/>
- <menuitem label="&configMenuItem;" oncommand="loadCONFIG();"/>
- </menupopup>
- </menu>
- </toolbar>
- <vbox flex ="1" >
-
- <groupbox>
-<hbox >
- <image id="logoImage"/>
- <spacer flex="1"/>
- <label class = "headLabelText" value="&escTitle;"/>
- <spacer flex="1"/>
-</hbox>
-</groupbox>
-
-
- <!-- <spacer flex="1" /> -->
-
- <groupbox flex = "1" >
-
- <caption label = "&keysCaption;" />
- <grid id ="BindingTable" >
- <columns>
-
- <column flex = "1" />
- <column flex = "1" />
- <column flex = "1"/>
- <column flex = "1"/>
- <column flex = "1" />
- </columns>
- <rows id="BindingTableRows">
- <row pack="center">
-
- <label class="titleText" value="&keyIssuer;" />
- <spacer flex= "1" class = "horSpacerShort" />
- <label class="titleText" value="&keyIssuedTo;" />
- <spacer flex = "1" class="horSpacerShort"/>
- <label class="titleText" value="&keyStatus;"/>
- <spacer flex = "1" class="horSpacerShort"/>
- <label class="titleText" value="&keyProgress;"/>
-
- </row>
-
- <spacer flex = "1" class="verticalSpacer" />
- <row id="NoKeysRow">
-
- <label class="rowLabelTextUninit" id="NoKeysLabel" value = "&noKeysPresent;" hidden="false"/>
-
- </row>
-
- </rows>
-
- </grid>
-
-<!-- <spacer flex="1" style="min-height: 20px" /> -->
-
- <hbox id="cylon1" class="cylonHBox" >
- <label class="titleText" id="operationtext" value=""/>
- <label id="eye1" hidden="true" value="...." class="cylonEye"> </label>
+ <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
+ <script src= "TRAY.js"/>
+ <script src="ESC.js"/>
+ <tabbox id="tablist" hidden="true">
+ <tabs>
+ <tab label="Settings" oncommand="loadSETTINGS();"/>
+ <tab label="Configuration" oncommand="loadCONFIG();"/>
+ </tabs>
+ </tabbox>
+ <vbox flex ="1" >
+ <hbox class="logoBox" >
+ <image id="logoImage"/>
+ <spacer class = "horSpacerVeryShort"/>
+ <vbox>
+ <spacer flex="1"/>
+ <label class = "headLabelText" value="&unenrolledDetected;" id="unenrolled-key-heading"/>
+
+ <label class = "headLabelText" value="&noKeyDetected;" id="no-key-heading" hidden="true"/>
+
+ <label class = "headLabelText" value="&pleaseEnroll;" id="enrolling-key-heading" hidden="false"/>
+
+ <spacer flex="1"/>
+ </vbox>
+ </hbox>
+ <groupbox flex="1" class="outerGroupBox" >
+ <description class="messageText" id="detected-key-message" >
+ &detectedMessage;
+ </description>
+ <description class="messageText" id="enroll-key-message" hidden="true">
+ &enrollMessage;
+ </description>
+ <vbox id="no_key_box" hidden="true">
+ <description class="boldMessageText">
+ &noKey;
+ </description>
+ <spacer flex="1" class="verticalSpacer"/>
+ <description class="messageText" >
+ &insertKey;
+ </description>
+ <spacer flex="2"/>
+ </vbox>
+ <vbox id="yes_key_box">
+ <spacer flex="1" class="verticalSpacer"/>
+ <description class="messageText">
+ &readyToProceed;
+ </description>
+
+ </vbox>
+ <spacer flex = "2"/>
+ <vbox id="key_enrollment_area" hidden="true">
+ <hbox>
+ <spacer flex = "1"/>
+ <groupbox flex = "1">
+ <caption label="&detectedKeyDetailsHeader;"/>
+ <vbox id="key_enrollment_row">
+ <hbox>
+ <spacer flex="1"/>
+ <progressmeter id="progress-id" hidden="true"/>
+ <spacer flex="1"/>
+ </hbox>
+ <grid >
+ <columns>
+ <column/>
+ <column flex="1" />
+ <column flex = "1" />
+ </columns>
+ <rows>
+ <row>
+ <label value = "&keyIssuer;" />
+ <spacer flex ="1"/>
+ <label id="issuer-id" value ="&unknownIssuer;" />
+ </row>
+ <row>
+ <label value = "&keyStatus;"/>
+ <spacer flex = "1"/>
+ <label id="status-id" value ="&unknown;"/>
+ </row>
+ <row>
+ <label value = "&keyIssuedTo;"/>
+ <spacer flex = "1"/>
+ <label id="issued-to-id" value ="&unknown;"/>
+ </row>
+ </rows>
+ </grid>
+ <spacer flex="1" class="verticalSpacer"/>
+ <hbox>
+ <spacer flex ="1" />
+ <image id="cylonImage" hidden="true"/>
+ <spacer flex = "1"/>
+ </hbox>
+ </vbox>
+ </groupbox>
+ <groupbox>
+ <caption label = "&keyEnrollmentHeader;"/>
+ <spacer flex = "1"/>
+ <grid>
+ <columns>
+ <column/>
+ <column flex="1" />
+ </columns>
+ <rows>
+ <row>
+ <label control="pintf" value="&pleaseEnterPassword;" maxlength="10"/>
+ <textbox id="pintf" type = "password" onkeypress="EvaluatePasswordQuality();"/>
+ </row>
+ <row>
+ <label control="reenterpintf" value="&pleaseReEnterPassword;" maxlength="10"/>
+ <textbox id="reenterpintf" type="password" />
+ </row>
+ </rows>
+ </grid>
+ <vbox>
+ <label value="&passwordQuality;"/>
+ <hbox>
+ <spacer flex = "1"/>
+ <image id="password-image" src="1-none.png"/>
+ <spacer flex="1"/>
+ </hbox>
+ </vbox>
+ </groupbox>
+ <spacer flex = "1"/>
+ </hbox>
+ </vbox>
+
+ <iframe id="esc-ui" flex="1" class="BorderedIFrame" hidden="true"/>
+ </groupbox>
+ <hbox id = "enrollment_button_box">
+ <spacer flex = "4"/>
+ <button id="closebtn" label ="&closeNow;" oncommand="HideEnrollmentPage()"/>
+ <button id="enrollbtn" label = "&enrollKeyNow;" oncommand="DoShowFullEnrollmentUI();" hidden="true" disabled="false"/>
+ <spacer class="horSpacerShort"/>
</hbox>
-
- <vbox>
- <groupbox flex = "1" >
- <caption label="&keyInformation;"/>
- <grid >
- <rows>
- <row>
- <label control="pintf" value="&enterKeyPin;" maxlength="10"/>
- <textbox id="pintf" type = "password"/>
- </row>
- <row>
- <label control="reenterpintf" value="&reEnterKeyPin;" maxlength="10"/>
- <textbox id="reenterpintf" type="password" />
- </row>
- <row>
- <button id="enrollbtn" label="&doEnroll;" oncommand="DoEnrollCoolKey();"/>
- <button id="cancelbtn" label="&doCancel;" oncommand="DoCancelOperation();"/>
- </row>
- </rows>
- </grid>
-
- </groupbox>
- </vbox>
-
- </groupbox>
- </vbox>
-
+</vbox>
</window>
Index: esc_browser.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc_browser.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- esc_browser.xul 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ esc_browser.xul 13 Sep 2006 17:56:49 -0000 1.2
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="esc.css" type="text/css"?>
-<!-- ***** BEGIN COPYRIGHT BLOCK *****
- * 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; version 2 of the License.
- *
- * 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., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- ***** END COPYRIGHT BLOCK ***** -->
-
-<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
-<window
- class="escwindow"
- id="esc-html-window"
- title="&escTitle;"
- width ="600"
- height= "600"
- onload="loadESCEnrollUI();"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
- <script src="ESC.js"/>
- <toolbox flex="0">
- <toolbar id="esc-menubar">
- <menu id="nav-menu" label="&navigationMenu;">
- <menupopup id="file-popup">
- <menuitem label="&settingsMenuItem;" oncommand="loadSETTINGS();"/>
- <menuitem label="&configMenuItem;" oncommand="loadCONFIG();"/>
- </menupopup>
- </menu>
- </toolbar>
- </toolbox>
-
-
- <label class = "headLabelText" value="&escTitle;"/>
-
- <grid >
- <rows >
- <row>
- <image id="logoImage"/>
-
- </row>
- </rows>
- </grid>
-
- <iframe id="esc-ui" flex="1" class="Bordered"/>
-
-
-</window>
Index: settings.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/settings.xul,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- settings.xul 12 Jun 2006 23:39:51 -0000 1.1.1.1
+++ settings.xul 13 Sep 2006 17:56:49 -0000 1.2
@@ -20,136 +20,133 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
class="escwindow"
- id="settings-window"
+ id="esc-window"
title="&escTitle;"
- onload="InitializeBindingTable()"
+ onload="InitializeAdminBindingList()"
onunload="cleanup()"
- width ="600"
- height= "450"
+ width ="720"
+ height= "460"
+ name="admin"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
- <script src="TRAY.js"/>
- <script src="ESC.js"/>
-
- <hbox>
- <toolbar id="esc-settings-smenubar">
- <menu id="settings-nav-menu" label="&navigationMenu;">
- <menupopup id="settings-nav-popup">
- <menuitem label="&enrollmentMenuItem;" oncommand="loadESC();"/>
- <menuitem label="&configMenuItem;" oncommand="loadCONFIG();"/>
- </menupopup>
- </menu>
-
- <menu id="op-menu" label="&operationsMenu;">
-
- <menupopup id="op-popup">
- <menuitem id="menu-format-item" label="&doFormat;" oncommand="DoFormatCoolKey();"/>
- <menuitem id="menu-reset-item" label="&doResetPin;" oncommand="DoResetSelectedCoolKeyPIN();"/>
- <menuitem id="menu-info-item" label="&keyInfo;" oncommand="DoShowKeyInfo();"/>
- </menupopup>
- </menu>
- </toolbar>
-
-</hbox>
-
-<groupbox>
-<hbox >
- <image id="logoImage"/>
- <spacer flex="1"/>
- <label class = "headLabelText" value="&settingsTitle;"/>
- <spacer flex="1"/>
-</hbox>
-</groupbox>
- <vbox flex = "1">
- <vbox flex = "4">
-
-<groupbox flex="1" >
-<caption label="&keysCaption;"/>
-
-<grid id ="BindingTable" >
-<columns>
-
- <column flex = "1" />
- <column flex = "1" />
- <column flex = "1" />
- <column flex = "1"/>
- <column flex = "1"/>
-</columns>
-<rows id="BindingTableRows">
- <row pack="center">
-
- <label class="titleText" value="&keyIssuer;" />
- <spacer flex= "1" class = "horSpacerShort" />
- <label class="titleText" value="&keyIssuedTo;" />
- <spacer flex = "1" class="horSpacerShort"/>
- <label class="titleText" value="&keyStatus;"/>
- <spacer flex = "1" class="horSpacerShort"/>
- <label class="titleText" value="&keyProgress;"/>
-
- </row>
-
- <spacer flex = "1" class="verticalSpacer" />
- <row id="NoKeysRow" >
-
- <label class="rowLabelTextUninit" id="NoKeysLabel" value = "&noKeysPresent;" hidden="false"/>
-
- </row>
-
-</rows>
-
-</grid>
-
-<hbox id="cylon1" class="cylonHBox" >
-
- <label class="titleText" id="operationtext" value="" />
- <label id="eye1" mode="determined" value = "..." hidden="true" class="cylonEye"> </label>
-</hbox>
-
- <groupbox flex = "1" >
- <caption label ="Key Information"/>
- <grid >
- <rows>
- <row>
- <label control="pintf" value="&enterKeyPin;" maxlength="10"/>
- <textbox id="pintf" type = "password"/>
- </row>
- <row>
- <label control="reenterpintf" value="&reEnterKeyPin;" maxlength="10"/>
- <textbox id="reenterpintf" type="password" />
- </row>
- </rows>
- </grid>
-
- </groupbox>
-
-</groupbox>
-
-<groupbox >
-<caption label="&keyOperationsCaption;" />
-<vbox flex = "1">
-<label class = "headLabelText" value = "&chooseKeyOperation;"/>
-<spacer flex = "1" class="verticalSpacer" />
-<hbox >
-
-<spacer flex = "1" />
-
-
-<button id="resetpinbtn" label="&doResetPin;" oncommand="DoResetSelectedCoolKeyPIN();"/>
-<spacer flex = "1" />
-
-<button id="keyinfobtn" label="&doShowKeyInfo;" oncommand="DoShowKeyInfo()" />
-<spacer flex = "1" />
-
-
-<button id="cancelbtn" label="&doCancel;" oncommand="DoCancelOperation();"/>
-<spacer flex = "1" />
-</hbox>
-<spacer flex = "1" class = "verticalSpacer" />
-</vbox>
-
-</groupbox>
-
-</vbox>
-</vbox>
+ <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
+ <script src="TRAY.js"/>
+ <script src="ESC.js"/>
+ <tabbox id="tablist" hidden="true">
+ <tabs>
+ <tab label="Enrollment" oncommand="loadESC();"/>
+ <tab label="Configuration" oncommand="loadCONFIG();"/>
+ </tabs>
+ </tabbox>
+ <hbox class="logoBox">
+ <image id="logoImage"/>
+ <spacer class = "horSpacerVeryShort"/>
+ <vbox>
+ <spacer flex="1"/>
+ <label class="headLabelText" value="&administerKeys;"/>
+ <spacer flex="1"/>
+ </vbox>
+ </hbox>
+ <groupbox flex ="1" orient="vertical" class="outerGroupBox">
+ <vbox id="administer-message-id">
+ <spacer flex="1"/>
+ <description class="messageText">
+ &administerMessage;
+ </description>
+ </vbox>
+ <hbox flex="1">
+ <groupbox flex="1" >
+ <caption label="&pluggedInCards;" class="captionText"/>
+ <vbox id="admin-no-keys-area">
+ <spacer flex ="1"/>
+ <description class="messageText">
+ &adminNoKeysMessage;
+ </description>
+ <spacer flex = "1"/>
+ </vbox>
+ <listbox id="AdminBindingList" flex="2" >
+ <listcols>
+ <listcol/>
+ <listcol flex="1"/>
+ <listcol flex="1"/>
+ <listcol flex="1"/>
+ <listcol flex="1"/>
+ </listcols>
+ <listhead>
+ <listheader />
+ <listheader flex="1" class="headerText" label="&keyIssuer;"/>
+ <listheader flex="1" class="headerText" label="&keyIssuedTo;"/>
+ <listheader flex="1" class="headerText" label="&keyStatus;"/>
+ <listheader flex="1" class="headerText" label="&keyProgress;"/>
+ </listhead>
+ </listbox>
+ </groupbox>
+ <groupbox flex="1" class="mediumWideBox" align="center">
+ <caption class="captionText" label="&detectedKeyDetailsHeader;"/>
+ <hbox class="outerBoxMedium" align="center">
+ <image id="admin-details-image" src="blank-cardx2.png"/>
+ <vbox class="outerGroupBox">
+ <label id="admin-key-details-label" value="&blankKeyLabel;" class ="mediumLabelText"/>
+ </vbox>
+ </hbox>
+
+ <!-- <spacer class="verticleSpacerShort"/> -->
+ <vbox id="password-area-id" hidden="true" >
+ <grid>
+ <columns>
+ <column flex="0"/>
+ </columns>
+ <rows>
+ <row>
+ <label control="pintf" value="&pleaseEnterPassword;" maxlength="10"/>
+ </row>
+ <row>
+ <textbox id="pintf" type = "password" />
+ </row>
+ <row>
+ <label control="reenterpintf" value="&pleaseReEnterPassword;" maxlength="10"/>
+ </row>
+ <row>
+ <textbox id="reenterpintf" type="password" />
+ </row>
+ <spacer class="verticalSpacer"/>
+ <row>
+ <label value="&passwordQuality;"/>
+ </row>
+ <row>
+ <image id="password-image" src="1-none.png"/>
+ <spacer flex = "1"/>
+ </row>
+ <row>
+ <spacer class="verticalSpacerShort"/>
+ </row>
+ </rows>
+ </grid>
+ </vbox>
+
+ <vbox class="outerBoxMedium" >
+ <description id="admin-details-message" class="messageText" hidden="true">
+ &adminDetailsMessage;
+ <spacer class="verticalSpacer"/>
+ </description>
+
+ <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey()" disabled="true" hidden = "false"/>
+
+ <button class="buttonText" id="resetpinbtn" label="&doResetPin;" oncommand="DoCollectPassword('resetpin');" disabled="true" hidden="false"/>
+
+ <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
+
+ <button class="buttonText" id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
+
+ <button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
+
+ </vbox>
+ </groupbox>
+ </hbox>
+ <hbox id = "enrollment_button_box" >
+ <spacer flex = "1"/>
+ <button class="buttonText" id="closebtn" label ="&closeAdminLater;" oncommand="HideAdminPage();"/>
+ <spacer class="horSpacerShort"/>
+ </hbox>
+ </groupbox>
</window>
17 years, 7 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US esc.dtd, 1.1.1.1, 1.2 esc.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12932
Modified Files:
esc.dtd esc.properties
Log Message:
Update to Latest.
Index: esc.dtd
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- esc.dtd 12 Jun 2006 23:39:50 -0000 1.1.1.1
+++ esc.dtd 13 Sep 2006 17:56:06 -0000 1.2
@@ -15,39 +15,68 @@
* All rights reserved.
***** END COPYRIGHT BLOCK ***** -->
-<!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY settingsTitle "Red Hat Enterprise Security Client Settings">
-<!ENTITY configTitle "Red Hat Enterprise Security Client Configuration">
+<!ENTITY escCompany "Red Hat">
+<!ENTITY smartCardManager "smart card manager">
+<!ENTITY smartCardManagerU "Smart Card Manager">
+<!ENTITY smartCard "smart card">
+<!ENTITY smartCardU "Smart Card">
+<!ENTITY escTitle "Smart Card Manager">
+<!ENTITY configTitle "Phone Home Configuration Information">
<!ENTITY certInfoTitle "ESC Key Info">
-<!ENTITY genericAuthTitle "ESC Authentication">
+<!ENTITY advancedInfoTitle "Diagnostics Information">
+<!ENTITY genericAuthTitle "Authentication">
<!ENTITY progressHeader "Progress">
<!ENTITY unknownIssuer "Unknown Issuer">
<!ENTITY unknown "Unknown">
<!ENTITY cancel "Cancel">
<!ENTITY doEnroll "Enroll">
<!ENTITY doCancel "Cancel">
-<!ENTITY doResetPin "Reset Pin">
+<!ENTITY doResetPin "Reset Password">
<!ENTITY doFormat "Format">
-<!ENTITY doShowKeyInfo "Show KeyInfo">
-<!ENTITY keyInfo "Key Info">
-<!ENTITY navigationMenu "Navigation">
-<!ENTITY operationsMenu "Operations">
-<!ENTITY settingsMenuItem "Settings">
-<!ENTITY enrollmentMenuItem "Enrollment">
-<!ENTITY configMenuItem "Configuration">
-<!ENTITY keysCaption "Keys">
-<!ENTITY keyOperationsCaption "Key Operations">
-<!ENTITY chooseKeyOperation "Choose Key Operation">
-<!ENTITY keyIssuer "Key Issuer">
-<!ENTITY keyIssuedTo "Key Issued To">
-<!ENTITY keyStatus "Key Status">
-<!ENTITY keyProgress "Key Progress">
-<!ENTITY noKeysPresent "NO KEYS PRESENT">
-<!ENTITY keyInformation "Key Information">
+<!ENTITY keyPassword "Password">
+<!ENTITY pluggedInCards "Plugged-In-Cards">
+<!ENTITY keyIssuer "Issuer">
+<!ENTITY keyIssuedTo "Issued To">
+<!ENTITY keyStatus "Status">
+<!ENTITY keyProgress "Progress">
+<!ENTITY noKeysPresent "No Cards Present">
<!ENTITY enterKeyPin "Enter Key Pin">
<!ENTITY reEnterKeyPin "Re Enter Key Pin">
<!ENTITY editConfigValues "Edit Configuration Values">
-<!ENTITY tpsURIHeader "TPS URI:">
+<!ENTITY tpsURIHeader "TPS Config URI:">
<!ENTITY escEnrollURIHeader "ESC ENROLL URI:">
<!ENTITY updateValues "Update Values">
-<!ENTITY doTest "Test">
+<!ENTITY doTest "Test URL">
+<!ENTITY pleaseEnroll "Smart Card Enrollment">
+<!ENTITY unenrolledDetected "Unenrolled Smart Card Detected">
+<!ENTITY noKeyDetected "No Smart Card Detected">
+<!ENTITY enrollMessage "To begin the smart card enrollment process, you will need to choose a password to protect the smart card. You will need to enter this password each time you use your new smart card. You will also need to enter the security information below needed by Smart Card Manager to complete your enrollment.">
+<!ENTITY detectedMessage "Smart Card Manager has detected that you have entered a new and un-enrolled smart card. Before you can use this smart card, you have to enroll it. Enrolling your smart card personalizes it so only you can use it for secure operations.">
+<!ENTITY readyToProceed "When you are ready to begin the process,click Enroll My Smart Card Now.">
+<!ENTITY noKey "Unable to detect your smart card.">
+<!ENTITY insertKey "To enroll your smart card, please insert your security card or USB key now.">
+<!ENTITY adminNoKeysMessage "In order to administer your security smart cards, you must have one or more cards connected to the computer. Please do so now.">
+<!ENTITY progressHeader "Progress">
+<!ENTITY detectedKeyDetailsHeader "Security Information">
+<!ENTITY keyEnrollmentHeader "Create Password">
+<!ENTITY passwordQuality "Password Quality">
+<!ENTITY unknownIssuer "Unknown Issuer">
+<!ENTITY unknown "Unknown">
+<!ENTITY pleaseEnterPassword "Enter new password:">
+<!ENTITY pleaseReEnterPassword "Re-enter password:">
+<!ENTITY closeEnrollLater "Close, I'll Enroll Later">
+<!ENTITY closeAdminLater "Close">
+<!ENTITY closeNow "Close">
+<!ENTITY enrollKeyNow "Enroll My Smart Card Now">
+<!ENTITY enrollKey "Enroll Smart Card">
+<!ENTITY administerKeys "Manage Smart Cards">
+<!ENTITY administerMessage "Here you can perform various operations upon your smart card(s). For instance, Formatting a card results in preparing a card for future enrollment.">
+<!ENTITY blankKeyLabel "Blank Key">
+<!ENTITY adminDetailsMessage "This smart card is not personalized.">
+<!ENTITY advancedInfo "Diagnostics">
+<!ENTITY doViewCerts "View My Certificates">
+<!ENTITY getESCPassword "Password Information">
+<!ENTITY escOK "OK">
+<!ENTITY escCancel "Cancel">
+<!ENTITY tpsConfigDesc "Smart Card Manager has detected a totally blank smart card. Smart Card Manager can not determine the location of the Smart Card Server for this card. Please enter the correct URL value so the Smart Card Server can be reached. The value should be of the form: http(s)://test.host.com:7888/home.cgi.">
+<!ENTITY diagnosticsMessage "The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.">
Index: esc.properties
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- esc.properties 12 Jun 2006 23:39:50 -0000 1.1.1.1
+++ esc.properties 13 Sep 2006 17:56:06 -0000 1.2
@@ -5,8 +5,7 @@
#
# 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.
-#
+# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -15,66 +14,158 @@
# All rights reserved.
# ***** END COPYRIGHT BLOCK
+#ESC strings used in Javascript
+#Strings for ESC.js
+escTitle=Smart Card Manager
+smartCard=smart card
+smartCardU=Smart Card
+enrolledKey=Enrolled
+noKeysPresent=No Cards Present
+blankKey=Blank
+uninitializedKey=Uninitialized
+statusEnrolled=ENROLLED
+statusUnavailable=UNAVAILABLE
+statusNoApplet=NO APPLET
+statusUninitialized=UNINITIALIZED
+statusUnknown=UNKNOWN
+statusBusy=BUSY
+unknownIssuer=Unknown Issuer
+redHatUser=User
+statusUnknown=Unknown
+tokenInformation=CARD INFORMATION
+advancedInformation=Diagnostics Information
+keyID=Key ID:
+tpsURI=Server URL:
+tpsUI=External UI URL:
+status=Status:
+issuer=Issuer:
+escLogEntries=Log Entries
+noLogFileOrData=No Log File or Log File Has No Data.
+certsOnToken=CERTIFICATES on KEY
+certificateNickname=Certificate Nickname:
+coolkeyComponentVersion=Smart Card Manager Version:
+coolkeyDetectedNumberKeys=Number of Smart Cards Detected:
+enrolledDetected=Enrolled Smart Card Detected
+enrolledDetectedMessage=Smart Card Manager has detected an enrolled card. If you would rather not re-enroll this card press "Close".
+formatingToken=Formatting...
+enrollingToken=Enrolling...
+resettingTokenPIN=Resetting Password...
+cancellingOperation=Cancelling...
+blinkingToken=Blinking...
+keyInserted=Smart Card Inserted!
+keyRemoved=Smart Card Removed!
+keyInsertedComputer=Security Smart Card Inserted into the computer.
+keyRemovedComputer=Security Smart Card Removed from the computer.
+diagnosticsMessage=The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.
+#ESC Error Messages from TPS
+errorNone=Operation Completed Successfully.
+serverError=Smart Card Server error.
+errorProblemResetTokenPin=Problem resetting smart card's pin.
+errorTokenEnrollment=Smart card enrollment error.
+errorCommCA=Error communicating with the Certification Authority.
+errorInternalServer=Internal Smart Card Server error.
+errorResetPin=Error resetting the smart card's password.
+errorInternalServer=Internal Smart Card Server error.
+errorAuthFailure=Smart Card Server authentication failure.
+errorTokenDisabled=Your smart card is listed as disabled.
+errorProblemCommToken=Problem communicating with the smart card.
+errorTokenUpgrade=Cannot upgrade smart card software.
+errorInvalidTokenType=Invalid smart card type.
+errorCannotPublish=Cannot publish smart card information.
+errorCommTokenDB=Cannot communicate with smart card database.
+errorPinReset=Cannot reset the password value for the smart card.
+errorConnLost=Connection to Smart Card Server.
+errorEntryTokenDB=Can not create entry for smart card in smart card database.
+errorNoTokenState=Smart card found to be in an inconsistent state.
+errorInvalidLostTokenReason=Invalid reason for lost smart card submitted.
+errorTokenUnusable=Smart card found to be unusable due to compromise.
+errorNoInactiveToken=No such inactive smart card found.
+errorProcessMultiTokens=Can not process more than one active smart card.
+errorKeyRecoveryProcessed=Smart card key recovery has been processed.
+errorKeyRecoveryFailed=Smart card key recovery failed.
+errorNoOperateLostToken=Cannot process this smart card, which has been reported lost.
+errorKeyArchival=Smart card key archival error.
+errorConnTKS=Problem connecting to the Smart Card TKS Server.
+errorFailUpdateTokenDB=Failed to update smart card database.
+errorCertRevocation=Internal certificate revocation error discovered.
+errorNotOwnToken=User does not own this smart card.
+errorESCMisconfigured=Smart Card Manager has been misconfigured.
+errorESCNoCommCardReader=Smart Card Manager can't communicate with card reader.
+errorESCNoTokenSession=Smart Card Manager can't initiate session with smart card.
+errorESCNoTalkTPS=Smart Card Manager can't talk to Smart Card Server.
+errorESCNoTalkTokenReader=Smart Card Manager can't talk to smart card reader.
+#ESC text in general Alert messages
+errorCoolKeyIsAuth=coolkey.GetCoolKeyIsAuthenticated() failed!
+errorAuthCoolKey=coolkey.AuthenticateCoolKey failed!
errorJsNotifyInterface=Can't find jsNotify interface.
-errorUniversalXPConnect=Can't get UniversalXPConnect
+errorUniversalXPConnect=Can't get UniversalXPConnect.
+errorConfigValue=Error obtaining issuer info for key.
errorConfigValue=Error Getting Config Value:
+errorSetConfigValue=Error SettingConfig Value:
errorBlankTPSURI=Blank Tps Uri submitted.
-aboutToTestTPSURI=About to test TPS URI:
-errorSelectKey=Please select a key.
-tpsURLContacted=TPS URL has been successfully contacted.
-errorContactTPSURL=Error contacting TPS URL, reconfigure and try again.
+noTpsConfigUrl=You must provide a Url to test!
+aboutToTestTPSURI=About to test Smart Card Server URI:
+errorSelectKey=Please select a Smart card.
+tpsURLContacted=Smart Card Server URL has been successfully contacted.
+errorContactTPSURL=Error contacting Smart Card Server URL, reconfigure and try again.
errorBlankEnrollURI=Blank Enroll Uri submitted.
-aboutToTestEnrollURI=About to test Enroll URI:
-enrollURLContacted=ESC Enrollment URL has been successfully contacted.
-errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try again.
-tpsURIMustHaveValue=TPS URI item must have a value!
-errorSetConfigValue=Error setting config value!:
+aboutToTestEnrollURI=About to test Enroll URI:
+enrollURLContacted=x Enrollment URL has been successfully contacted.
+errorContactEnrollURL=Error contacting Enroll URL, reconfigure and try again.
+tpsConfigSuccess=Smart Card Server config information successfully obtained!
+tpsConfigError=Error obtaining Smart Card Server config information!
+tpsConfigTest=About to test the Smart Card Server Phone Home Url :
+tpsNoConfigUrl=Provide a valid Smart Card Server config URL!
+tpsURIMustHaveValue=Smart Card Server URL item must have a value!
+errorSetConfigValue=Error setting config value!:
configChangesSubmitted=Configuration changes submitted.
-errorSetDataValue=Error Setting data values:
-errorCoolKeyGetStatus=coolkey.GetCoolKeyStatus() failed!
-errorCoolKeyRequiresAuth=coolkey.GetCoolKeyRequiresAuthentication() failed!
-errorCoolKeyIsAuth=coolkey.GetCoolKeyIsAuthenticated() failed!
-errorAuthCoolKey=coolkey.AuthenticateCoolKey failed!
-statusEnrolled=ENROLLED
-unknownIssuer=Unknown Issuer
-redHatUser=Red Hat User
-statusUnknown=Unknown
-errorNone=Operation Completed Successfully.
-serverError=Server Error.
-errorProblemResetTokenPin=Problem resetting token's pin.
-errorTokenEnrollment=Token Enrollment Error.
-errorCommCA=Error communicating with the Certificate Authority, try again later.
-errorInternalServer=Internal Server Error.
-errorResetPin=Error resetting the token's pin.
-errorInternalServer=Internal Server Error.
-errorAuthFailure=Authentication Failure, Try Again.
-errorTokenDisabled=Token is disabled, contact technical support.
-errorProblemCommToken=Problem communicating with the token.
-errorTokenUpgrade=Cannot upgrade token software.
-errorInvalidTokenType=Invalid token type.
-errorCannotPublish=Cannot publish.
-errorCommTokenDB=Cannot communicate with token database, try again later.
-errorTokenDisabled=Token is disabled, contact techincal support.
-errorPinReset=Cannot reset pin value for the token, contact technical support.
-errorConnLost=Connection to server lost.
-errorEntryTokenDB=Can not create entry for token in database, contact technical support.
-errorNoTokenState=No such token state, contact technical support.
-errorInvalidLostTokenReason=Invalid lost token reason, contact technical support.
-errorTokenUnusable=Token unusable due to compromise,contact technical support.
-errorNoInactiveToken=No such inactive token, contact technical support.
-errorProcessMultiTokens=Can not process more than one active token.
-errorKeyRecoveryProcessed=Key Recovery has been processed.
-errorKeyRecoveryFailed=Key Recovery failed, contact technical support.
-errorNoOperateLostToken=Can not operate on token reported lost, contact technical support.
-errorKeyArchival=Key archival error, contact technical support.
-errorConnTKS=Problem connecting to the TKS, contact technical support.
-errorFailUpdateTokenDB=Failed to update token database, contact technical support.
-errorCertRevocation=Internal certificate revocation error,contact technical support.
-errorNotOwnToken=User does not own this token, contact technical support.
-errorESCMisconfigured=ESC has been misconfigured, reconfigure and try again.
-errorESCNoCommCardReader=ESC can't communicate with card reader.
-errorESCNoTokenSession=ESC can't initiate session with token.
-errorESCNoTalkTPS=ESC can't talk to TPS.
-errorESCNoTalkTokenReader=ESC can't talk to token reader.
-
-
+errorSetDataValue=Error Setting data values:
+errorCoolKeyGetStatus=coolkey.GetCoolKeyStatus() failed!
+errorCoolKeyGetPolicy=coolkey.GetCoolKeyPolicy() failed!
+errorCoolKeyRequiresAuth=coolkey.GetCoolKeyRequiresAuthentication() failed!
+errorCoolKeyIsAuth=coolkey.GetCoolKeyIsAuthenticated() failed!
+errorCoolKeyCertNicknames=coolkey.GetCoolKeyCertNicknames() failed!
+errorAuthCoolKey=coolkey.AuthenticateCoolKey failed!
+errorCoolKeyCertInfo=coolkey.GetCoolKeyCertInfo() failed!
+errorGetAvailCoolKeys=coolkey.GetAvailableCoolKeys() failed!
+errorEnollCoolKey=coolkey.EnrollCoolKey() failed!
+errorCoolKeyIsEnrolled=coolkey.GetCoolKeyIsEnrolled failed!
+errorResetCoolKeyPIN=coolkey.ResestCoolKeyPIN() failed! Make sure Smart card is properly Enrolled.
+errorFormatCoolKey=coolkey.FormatCoolKey() failed!
+errorCancelCoolKey=coolkeyCancelCoolKeyOperation() failed!
+errorBlinkCoolKey=coolkey.BlinkCoolKey() failes!
+noCurrentlySelectedToken=No currently selected smart card!
+errorProvideScreenName=You must provide a valid screen name!
+errorProvideTokenPIN=You must provide a valid TokenPIN!
+errorMatchPinValues=The PIN values you entered don't match!
+errorValidUserPassword=You must provide a valid User Password!
+errorSelectKey=Please select a smart card.
+errorEnrolledFirst=Smart card must be enrolled first! Enroll card and try again.
+enrollmentFor=Enrollment for
+wasSuccessful=was successful.
+pinResetSuccessful=Password Reset was successfull!
+formatOf=Format of
+error=Error
+serverResponse= \n\n Server Response:
+enrollmentOfKey=Enrollment of smart card
+formatingOfKey=Formatting of smart card
+pinResetOfKey=PIN Reset for smart card
+operationForKey=Operation for smart card
+failed=failed.
+cancelled=cancelled.
+errorFindESCPlatform=Unable to determine Smart Card Manager platform.
+errorIssuerInfo=Error obtaining Issuer Info for key.
+#Strings for TRAY.j
+errorTrayIsInitialized=Can't determine if Icon component is already intialized!
+errorShowAllWindows=Error Showing All Windows:
+errorHideAllWindows=Error Hiding all Windows:
+errorShowWindow=Error Showing Window:
+errorHideWindow=Error Hiding Window:
+errorRemoveWindow=Error Removing Window:
+errorTrayNotification=Error Sending Tray notification:
+#Strings for GenericAuth.js
+value=Value
+mustMatch=must match
+mustHaveValue=Must have value set for field:
+noParentWindow=No parent window.
+authDialogNoParent=Auth dialog has no parent!
17 years, 7 months