YaST modules rename from novell-casa to CASA continued.

This commit is contained in:
Cameron (Kamran) Mashayekhi
2006-04-20 18:50:11 +00:00
parent e7a702a8bd
commit a9d7e832c2
31 changed files with 214 additions and 203 deletions

View File

@@ -1,3 +1,8 @@
miCASA.ybc: \
/usr/share/YaST2/modules/Progress.ybc \
/usr/share/YaST2/modules/Report.ybc \
/usr/share/YaST2/modules/Summary.ybc
NovellCasa.ybc: \
/usr/share/YaST2/modules/Progress.ybc \
/usr/share/YaST2/modules/Report.ybc \

View File

@@ -19,5 +19,5 @@ X-SuSE-YaST-AutoInstResource=CASA
Icon=CASA
Exec=/sbin/yast2 CASA
Name=Novell CASA
Name=CASA
GenericName=Configure CASA

View File

@@ -38,7 +38,7 @@ textdomain "CASA";
/* The main () */
y2milestone ("----------------------------------------");
y2milestone ("Novell CASA module started");
y2milestone ("CASA module started");
import "Progress";
import "Report";
@@ -83,7 +83,7 @@ else ret = CommandLine::Run(cmdline_description);
y2debug("ret=%1", ret);
/* Finish */
y2milestone("Novell CASA module finished");
y2milestone("CASA module finished");
y2milestone("----------------------------------------");
return ret;

View File

@@ -43,7 +43,7 @@
textdomain "CASA";
y2milestone("----------------------------------------");
y2milestone("Novell CASA auto started");
y2milestone("CASA auto started");
import "NovellCasa";
include "CASA/wizards.ycp";
@@ -108,7 +108,7 @@ else {
}
y2debug("ret=%1", ret);
y2milestone("Novell CASA auto finished");
y2milestone("CASA auto finished");
y2milestone("----------------------------------------");
return ret;

View File

@@ -38,7 +38,7 @@ import "Progress";
/* The main () */
y2milestone("----------------------------------------");
y2milestone("Novell CASA proposal started");
y2milestone("CASA proposal started");
string func = (string) WFM::Args(0);
map param = (map) WFM::Args(1);
@@ -81,10 +81,10 @@ else if(func == "AskUser") {
/* create titles */
else if(func == "Description") {
ret = $[
/* Rich text title for NovellCasa in proposals */
"rich_text_title" : _("Novell CASA"),
/* Menu title for NovellCasa in proposals */
"menu_title" : _("&Novell CASA"),
/* Rich text title for CASA in proposals */
"rich_text_title" : _("CASA"),
/* Menu title for CASA in proposals */
"menu_title" : _("&CASA"),
"id" : "CASA",
];
}
@@ -99,7 +99,7 @@ else {
/* Finish */
y2debug("ret=%1",ret);
y2milestone("Novell CASA proposal finished");
y2milestone("CASA proposal finished");
y2milestone("----------------------------------------");
return ret;

View File

@@ -2,7 +2,7 @@
# src/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -73,18 +73,18 @@ yncludeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(client_DATA) $(desktop_DATA) $(icons_DATA) $(module_DATA) \
$(modulebin_DATA) $(theme_DATA) $(ynclude_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run aclocal-1.9
AMTAR = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run tar
AUTOCONF = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run autoconf
AUTOHEADER = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run autoheader
AUTOMAKE = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run automake-1.9
ACLOCAL = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run aclocal-1.9
AMTAR = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run tar
AUTOCONF = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run autoconf
AUTOHEADER = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run autoheader
AUTOMAKE = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run automake-1.9
AWK = gawk
CREATE_PKGCONFIG_FALSE =
CREATE_PKGCONFIG_NOARCH_FALSE =
CREATE_PKGCONFIG_NOARCH_TRUE = #
CREATE_PKGCONFIG_TRUE = #
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\"
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.462\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.462\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.462\"
ECHO_C =
ECHO_N = -n
ECHO_T =
@@ -97,13 +97,13 @@ LIBS =
LN_S = ln -s
LTLIBOBJS =
MAINTAINER = casa <casa@novell.com>
MAKEINFO = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run makeinfo
MAKEINFO = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo
PACKAGE = yast2-CASA
PACKAGE_BUGREPORT = http://www.suse.de/feedback
PACKAGE_NAME = yast2-CASA
PACKAGE_STRING = yast2-CASA 1.6.0
PACKAGE_STRING = yast2-CASA 1.6.462
PACKAGE_TARNAME = yast2-CASA
PACKAGE_VERSION = 1.6.0
PACKAGE_VERSION = 1.6.462
PATH_SEPARATOR = :
PKG_CONFIG_PATH =
RPMNAME = yast2-CASA
@@ -115,7 +115,7 @@ STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
VERSION = 1.6.0
VERSION = 1.6.462
XGETTEXT = /usr/bin/xgettext
YCPC = /usr/bin/ycpc
YCPDOC = /usr/lib/YaST2/bin/ycpdoc
@@ -146,7 +146,7 @@ host_vendor = suse
imagedir = ${prefix}/share/YaST2/images
includedir = ${prefix}/include/YaST2
infodir = ${prefix}/info
install_sh = /home/nds_cm/dev/yast/casa-yast/install-sh
install_sh = /home/cameron/dev/subversion/trunk/casa-yast/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${prefix}/share/YaST2/locale
@@ -180,7 +180,7 @@ ystartupdir = ${prefix}/lib/YaST2
iconsdir = /usr/share/applications
client_DATA = \
CASA.ycp \
CASA_auto.ycp \
CASA_auto.ycp \
CASA_proposal.ycp
ynclude_DATA = \
@@ -193,7 +193,7 @@ desktop_DATA = \
CASA.desktop
module_DATA = \
NovellCasa.ycp
miCASA.ycp
icons_DATA = \
icons/install_casa_yast_icons

View File

@@ -20,7 +20,7 @@ desktop_DATA = \
CASA.desktop
module_DATA = \
NovellCasa.ycp
miCASA.ycp
icons_DATA = \
icons/install_casa_yast_icons

View File

@@ -2,7 +2,7 @@
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -180,7 +180,7 @@ ystartupdir = @ystartupdir@
iconsdir = /usr/share/applications
client_DATA = \
CASA.ycp \
CASA_auto.ycp \
CASA_auto.ycp \
CASA_proposal.ycp
ynclude_DATA = \
@@ -193,7 +193,7 @@ desktop_DATA = \
CASA.desktop
module_DATA = \
NovellCasa.ycp
miCASA.ycp
icons_DATA = \
icons/install_casa_yast_icons

Binary file not shown.

View File

@@ -83,8 +83,8 @@ symbol WriteDialog() {
*/
any SummaryDialog() {
/* NovellCasa summary dialog caption */
string caption = _("Novell CASA Configuration");
/* CASA summary dialog caption */
string caption = _("CASA Configuration");
/* FIXME */
list summary = NovellCasa::Summary();
@@ -92,10 +92,10 @@ any SummaryDialog() {
string configured = summary[0]:"";
/* Frame label */
// term contents = Wizard_hw::DetectedContent(_("NovellCasa to Configure"),
// term contents = Wizard_hw::DetectedContent(_("CASA to Configure"),
// unconfigured, false, configured);
term contents = `Frame(_(" Novell CASA Configuration Wizard Pages "),
term contents = `Frame(_(" CASA Configuration Wizard Pages "),
`VBox(
`VSpacing(),
`VSpacing(),
@@ -140,7 +140,8 @@ any SummaryDialog() {
else if(ret == `next) {
break;
}
else if(ret == `install_casa_button) {
else if(ret == `install_casa_button) {
// launch the install script here
y2milestone ("SummaryDialog() launch the install script");
integer iInstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/casacfgpam");
@@ -194,20 +195,20 @@ any SummaryDialog() {
*/
any OverviewDialog() {
/* NovellCasa overview dialog caption */
string caption = _("Novell CASA Overview");
/* CASA overview dialog caption */
string caption = _("CASA Overview");
list overview = NovellCasa::Overview();
/* FIXME table header */
// term contents = Wizard_hw::ConfiguredContent(
// /* Table header */
// `header(_("Number"), _("Novell CASA")),
// `header(_("Number"), _("CASA")),
// overview, nil, nil, nil, nil );
// contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0);
term contents = `Frame(_("Novell Client Configuration Wizard Pages"),
term contents = `Frame(_("CASA Configuration Wizard Pages"),
`VBox(
`VSpacing(),
`VSpacing(),

View File

@@ -37,7 +37,7 @@ textdomain "CASA";
map HELPS = $[
/* Read dialog help 1/2 */
"read" : _("<p><b><big>Initializing Novell CASA Configuration</big></b><br>
"read" : _("<p><b><big>Initializing CASA Configuration</big></b><br>
Please wait...<br></p>
") +
@@ -47,7 +47,7 @@ Safely abort the configuration utility by pressing <b>Abort</b> now.</p>
"),
/* Write dialog help 1/2 */
"write" : _("<p><b><big>Saving Novell CASA Configuration</big></b><br>
"write" : _("<p><b><big>Saving CASA Configuration</big></b><br>
Please wait...<br></p>
") +
@@ -60,13 +60,13 @@ An additional dialog informs whether it is safe to do so.
/* Summary dialog help 1/3 */
"summary" : _("<p><b><big>Novell CASA Configuration</big></b><br>
Configure Novell CASA here.<br></p>
Configure CASA here.<br></p>
") +
/* Summary dialog help 2/3 */
_("<p><b><big>Adding Novell CASA:</big></b><br>
Choose Novell CASA from the list of detected services.
If your Novell CASA was not autodetected, use <b>Other (not detected)</b>.
_("<p><b><big>Adding CASA:</big></b><br>
Choose CASA from the list of detected services.
If CASA was not autodetected, use <b>Other (not detected)</b>.
Then press <b>Configure</b>.</p>
") +
@@ -78,17 +78,17 @@ the configuration opens.</p>
/* Ovreview dialog help 1/3 */
"overview" : _("<p><b><big>Novell CASA Configuration Overview</big></b><br>
Obtain an overview of installed Novell CASA. Additionally
Obtain an overview of installed CASA. Additionally
edit their configuration.<br></p>
") +
/* Ovreview dialog help 2/3 */
_("<p><b><big>Adding Novell CASA:</big></b><br>
Press <b>Add</b> to configure Novell CASA.</p>") +
_("<p><b><big>Adding CASA:</big></b><br>
Press <b>Add</b> to configure CASA.</p>") +
/* Ovreview dialog help 3/3 */
_("<p><b><big>Editing or Deleting:</big></b><br>
Choose Novell CASA to change or remove.
Choose CASA to change or remove.
Then press <b>Edit</b> or <b>Delete</b> as desired.</p>
"),

BIN
casa-yast/src/miCASA.ybc Normal file

Binary file not shown.

View File

@@ -160,7 +160,7 @@ any NovellCasaSequence() {
any NovellCasaAutoSequence() {
/* Initialization dialog caption */
string caption = _("Novell CASA Configuration");
string caption = _("CASA Configuration");
/* Initialization dialog contents */
term contents = `Label(_("Initializing..."));