Revision: 2831
http://ipcop.svn.sourceforge.net/ipcop/?rev=2831&view=rev
Author: owes
Date: 2009-05-10 13:55:00 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Rearrange some texts in setup, networking section left to be done!
When installing some settings have defaults, so a 'Skip' is possible.
When run as setup, 'OK' means do/change something and 'Go Back' means go back
without any changes.
Modified Paths:
--------------
ipcop/trunk/src/installer/host_domain.c
ipcop/trunk/src/installer/keymap.c
ipcop/trunk/src/installer/passwords.c
ipcop/trunk/src/installer/setup.c
ipcop/trunk/src/installer/timezone.c
Modified: ipcop/trunk/src/installer/host_domain.c
===================================================================
--- ipcop/trunk/src/installer/host_domain.c 2009-05-10 13:18:32 UTC (rev
2830)
+++ ipcop/trunk/src/installer/host_domain.c 2009-05-10 13:55:00 UTC (rev
2831)
@@ -17,7 +17,7 @@
* along with IPCop; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * (c) 2007-2008, the IPCop team
+ * (c) 2007-2009, the IPCop team
*
* $Id$
*
@@ -104,8 +104,8 @@
}
for (;;) {
- rc = newtWinEntries(gettext("TR_HOSTNAME"),
gettext("TR_ENTER_HOSTNAME"),
- 65, 5, 5, 40, entries, gettext("TR_OK"),
gettext("TR_CANCEL"), NULL);
+ rc = newtWinEntries(gettext("TR_HOSTNAME"),
gettext("TR_ENTER_HOSTNAME"), 65, 5, 5, 40, entries,
+ gettext("TR_OK"), (flag_installer) ?
gettext("TR_SKIP") : gettext("TR_GO_BACK"), NULL);
if (rc == 1) {
strcpy(hostname, values[0]);
@@ -119,7 +119,10 @@
else {
update_kv(&kv, "HOSTNAME", hostname);
write_kv_to_file(&kv, "/var/ipcop/main/settings");
- writehostsfiles(hostname, domainname);
+ if (!flag_installer) {
+ /* In case of installation we will simply rewrite the
files after setting the domainname */
+ writehostsfiles(hostname, domainname);
+ }
result = SUCCESS;
break;
}
@@ -165,8 +168,8 @@
}
for (;;) {
- rc = newtWinEntries(gettext("TR_DOMAINNAME"),
gettext("TR_ENTER_DOMAINNAME"),
- 65, 5, 5, 40, entries, gettext("TR_OK"),
gettext("TR_CANCEL"), NULL);
+ rc = newtWinEntries(gettext("TR_DOMAINNAME"),
gettext("TR_ENTER_DOMAINNAME"), 65, 5, 5, 40, entries,
+ gettext("TR_OK"), (flag_installer) ?
gettext("TR_SKIP") : gettext("TR_GO_BACK"), NULL);
if (rc == 1) {
strcpy(domainname, values[0]);
@@ -187,6 +190,10 @@
}
else {
result = FAILURE;
+ if (flag_installer) {
+ /* In case of installation always the files */
+ writehostsfiles(hostname, domainname);
+ }
break;
}
}
Modified: ipcop/trunk/src/installer/keymap.c
===================================================================
--- ipcop/trunk/src/installer/keymap.c 2009-05-10 13:18:32 UTC (rev 2830)
+++ ipcop/trunk/src/installer/keymap.c 2009-05-10 13:55:00 UTC (rev 2831)
@@ -17,7 +17,7 @@
* along with IPCop; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * (c) 2007-2008, the IPCop team
+ * (c) 2007-2009, the IPCop team
*
* $Id$
*
@@ -99,7 +99,7 @@
}
rc = newtWinMenu(gettext("TR_KEYBOARD_MAPPING"),
gettext("TR_KEYBOARD_MAPPING_LONG"), 50, 5, 5, 6, displaynames,
- &choice, gettext("TR_OK"), gettext("TR_CANCEL"), NULL);
+ &choice, gettext("TR_OK"), (flag_installer) ?
gettext("TR_SKIP") : gettext("TR_GO_BACK"), NULL);
strcpy(keymap, filenames[choice]);
Modified: ipcop/trunk/src/installer/passwords.c
===================================================================
--- ipcop/trunk/src/installer/passwords.c 2009-05-10 13:18:32 UTC (rev
2830)
+++ ipcop/trunk/src/installer/passwords.c 2009-05-10 13:55:00 UTC (rev
2831)
@@ -49,10 +49,8 @@
do {
done = 1;
- /* TODO: remove CANCEL when installing, on installation a password
*must* be set,
- if no password is set we are left with a broken IPCop */
rc = newtWinEntries(gettext("TR_TITLE_PASSWORD"), text,
- 68, 5, 5, 40, entries, gettext("TR_OK"),
gettext("TR_CANCEL"), NULL);
+ 68, 5, 5, 40, entries, gettext("TR_OK"),
(flag_installer) ? NULL : gettext("TR_GO_BACK"), NULL);
if (rc == 2) {
return FAILURE;
@@ -166,7 +164,7 @@
rc = newtWinMenu(gettext("TR_PASSWORDS"),
gettext("TR_SELECT_THE_ITEM"), 50, 5, 5, 11,
- menuchoices, &choice, gettext("TR_OK"),
gettext("TR_QUIT"), NULL);
+ menuchoices, &choice, gettext("TR_OK"),
gettext("TR_GO_BACK"), NULL);
if (rc == 2)
break;
Modified: ipcop/trunk/src/installer/setup.c
===================================================================
--- ipcop/trunk/src/installer/setup.c 2009-05-10 13:18:32 UTC (rev 2830)
+++ ipcop/trunk/src/installer/setup.c 2009-05-10 13:55:00 UTC (rev 2831)
@@ -17,7 +17,7 @@
* along with IPCop; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * (c) 2007-2008, the IPCop team
+ * (c) 2007-2009, the IPCop team
*
* Commandline options:
*
Modified: ipcop/trunk/src/installer/timezone.c
===================================================================
--- ipcop/trunk/src/installer/timezone.c 2009-05-10 13:18:32 UTC (rev
2830)
+++ ipcop/trunk/src/installer/timezone.c 2009-05-10 13:55:00 UTC (rev
2831)
@@ -17,7 +17,7 @@
* along with IPCop; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * (c) 2007-2008, the IPCop team
+ * (c) 2007-2009, the IPCop team
*
* $Id$
*
@@ -93,7 +93,7 @@
}
rc = newtWinMenu(gettext("TR_TIMEZONE"), gettext("TR_TIMEZONE_LONG"), 50,
5, 5, 6, displaynames, &choice,
- gettext("TR_OK"), gettext("TR_CANCEL"), NULL);
+ gettext("TR_OK"), (flag_installer) ? gettext("TR_SKIP") :
gettext("TR_GO_BACK"), NULL);
strcpy(timezone, filenames[choice]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
