mirror of
https://github.com/opnsense/src.git
synced 2026-06-10 17:22:46 -04:00
Fix conditional bogon in Label Editor [from Ed Gold]
Print info boxes without titles.
This commit is contained in:
parent
4a595144c0
commit
c3a6bc8315
6 changed files with 21 additions and 21 deletions
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
|
||||
* $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
|
|||
label_chunk_info[j].c = NULL;
|
||||
if (here >= j) {
|
||||
here = j ? j - 1 : 0;
|
||||
pslice_focus = here; /* VEG 09/05/97 */
|
||||
label_focus = here; /* VEG 09/05/97 */
|
||||
}
|
||||
if (ChunkWin) {
|
||||
wclear(ChunkWin);
|
||||
|
|
@ -607,6 +605,8 @@ diskLabel(char *str)
|
|||
Device **devs;
|
||||
int override_focus_adjust = 0;
|
||||
|
||||
label_focus = 0;
|
||||
pslice_focus = 0;
|
||||
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
|
||||
if (!devs) {
|
||||
msgConfirm("No disks found!");
|
||||
|
|
@ -1067,7 +1067,7 @@ diskLabel(char *str)
|
|||
msg = _msg;
|
||||
break;
|
||||
}
|
||||
if (override_focus_adjust) {
|
||||
if (!override_focus_adjust) {
|
||||
if (label_chunk_info[here].type == PART_SLICE)
|
||||
pslice_focus = here;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
|
||||
* $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
|
|||
if (isDebug())
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
|
||||
|
|
@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
|
|||
use_helpfile(NULL);
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
|
||||
* $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
|
|||
label_chunk_info[j].c = NULL;
|
||||
if (here >= j) {
|
||||
here = j ? j - 1 : 0;
|
||||
pslice_focus = here; /* VEG 09/05/97 */
|
||||
label_focus = here; /* VEG 09/05/97 */
|
||||
}
|
||||
if (ChunkWin) {
|
||||
wclear(ChunkWin);
|
||||
|
|
@ -607,6 +605,8 @@ diskLabel(char *str)
|
|||
Device **devs;
|
||||
int override_focus_adjust = 0;
|
||||
|
||||
label_focus = 0;
|
||||
pslice_focus = 0;
|
||||
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
|
||||
if (!devs) {
|
||||
msgConfirm("No disks found!");
|
||||
|
|
@ -1067,7 +1067,7 @@ diskLabel(char *str)
|
|||
msg = _msg;
|
||||
break;
|
||||
}
|
||||
if (override_focus_adjust) {
|
||||
if (!override_focus_adjust) {
|
||||
if (label_chunk_info[here].type == PART_SLICE)
|
||||
pslice_focus = here;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
|
||||
* $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
|
|||
if (isDebug())
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
|
||||
|
|
@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
|
|||
use_helpfile(NULL);
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
|
||||
* $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
|
|||
label_chunk_info[j].c = NULL;
|
||||
if (here >= j) {
|
||||
here = j ? j - 1 : 0;
|
||||
pslice_focus = here; /* VEG 09/05/97 */
|
||||
label_focus = here; /* VEG 09/05/97 */
|
||||
}
|
||||
if (ChunkWin) {
|
||||
wclear(ChunkWin);
|
||||
|
|
@ -607,6 +605,8 @@ diskLabel(char *str)
|
|||
Device **devs;
|
||||
int override_focus_adjust = 0;
|
||||
|
||||
label_focus = 0;
|
||||
pslice_focus = 0;
|
||||
devs = deviceFind(NULL, DEVICE_TYPE_DISK);
|
||||
if (!devs) {
|
||||
msgConfirm("No disks found!");
|
||||
|
|
@ -1067,7 +1067,7 @@ diskLabel(char *str)
|
|||
msg = _msg;
|
||||
break;
|
||||
}
|
||||
if (override_focus_adjust) {
|
||||
if (!override_focus_adjust) {
|
||||
if (label_chunk_info[here].type == PART_SLICE)
|
||||
pslice_focus = here;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
|
||||
* $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
|
|||
if (isDebug())
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
|
||||
|
|
@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
|
|||
use_helpfile(NULL);
|
||||
msgDebug("Notify: %s\n", errstr);
|
||||
dialog_clear_norefresh();
|
||||
dialog_msgbox(" ", errstr, -1, -1, 0);
|
||||
dialog_msgbox(NULL, errstr, -1, -1, 0);
|
||||
}
|
||||
|
||||
/* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
|
||||
|
|
|
|||
Loading…
Reference in a new issue