Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vecs
FIJI Public
Commits
5a577fc7
Commit
5a577fc7
authored
Jul 13, 2016
by
Stefan Tauner
Browse files
Get rid of useless, single OK buttons
They are generated by DialogBoxUL automatically.
parent
6af09956
Changes
5
Hide whitespace changes
Inline
Side-by-side
bin/Tk/FIJISettingsViewer.pm
View file @
5a577fc7
...
...
@@ -267,8 +267,7 @@ sub update {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
'
Something went horribly wrong!
',
-
wraplength
=>
200
,
-
title
=>
'
Warning
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Warning
',);
$d
->
Show
();
return
;
...
...
@@ -568,8 +567,7 @@ sub _populate_widget {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
alert_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
$self
->
screenwidth
,
-
text
=>
"
$rv
",
-
title
=>
"
Warning
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Warning
",);
$d
->
Show
();
}
elsif
(
defined
$netname
)
{
$self
->
{'
settings
'}
->
{'
design
'}
->
{
$k
}
=
$netname
;
...
...
@@ -927,8 +925,7 @@ sub _add_fiu ($$) {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
alert_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
$fr_fiu
->
screenwidth
,
-
text
=>
"
$rv
",
-
title
=>
"
Warning
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Warning
",);
$d
->
Show
();
}
elsif
(
defined
$netname
&&
$netname
ne
"")
{
@
{
$self
->
{'
settings
'}
->
{'
fius
'}}[
$i
]
->
{'
FIU_NET_NAME
'}
=
$netname
;
...
...
@@ -949,8 +946,7 @@ sub _add_fiu ($$) {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
alert_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
$fr_fiu
->
screenwidth
,
-
text
=>
"
$msg
",
-
title
=>
"
Warning
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Warning
",);
$d
->
Show
();
}
...
...
@@ -969,8 +965,7 @@ sub _add_fiu ($$) {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
alert_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
$fr_fiu
->
screenwidth
,
-
text
=>
"
$rv
",
-
title
=>
"
Warning
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Warning
",);
$d
->
Show
();
}
else
{
$self
->
_highlight_widget
(
$drv_entry
,
0
);
...
...
@@ -1145,8 +1140,7 @@ sub _set_fields_by_button {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
200
,
-
text
=>
"
\"
"
.
$f
->
{'
description
'}
.
"
\"\n
forbids
\n\"
"
.
$button
->
{'
description
'}
.
"
\"
.
",
-
title
=>
"
Error
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Error
",);
$d
->
Show
();
}
}
...
...
bin/Tk/FIJITestsViewer.pm
View file @
5a577fc7
...
...
@@ -306,8 +306,7 @@ sub _download {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$text
,
-
title
=>
"
Error while downloading.
",
-
buttons
=>
[
qw/OK/
]);
-
title
=>
"
Error while downloading.
",);
$d
->
Show
();
}
...
...
@@ -341,8 +340,7 @@ sub get_last_test {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Export failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Export failed!
',);
$d
->
Show
();
}
else
{
$lt
=
$self
->
{'
last_test
'};
...
...
@@ -1047,8 +1045,7 @@ sub _set_fields_by_button {
$
{
$button
->
cget
('
-variable
')}
=
0
;
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
"
\"
"
.
$f
->
{'
description
'}
.
"
\"\n
forbids
\n\"
"
.
$button
->
{'
description
'}
.
"
\"
.
",
-
title
=>
"
Error.
",
-
buttons
=>
[
qw/OK/
]);
-
title
=>
"
Error.
",);
$d
->
Show
();
}
}
...
...
bin/Tk/FIJIUtils.pm
View file @
5a577fc7
...
...
@@ -106,8 +106,7 @@ sub cross_platform_open {
if
(
defined
(
$ret
))
{
my
$d
=
$parent
->
FIJIModalDialog
(
-
image
=>
error_image
(
$parent
),
-
text
=>
$ret
,
-
title
=>
"
Could not open
$path
",
-
buttons
=>
["
OK
"]);
-
title
=>
"
Could not open
$path
",);
$d
->
Show
();
}
}
...
...
bin/fiji_ee_gui.pl
View file @
5a577fc7
...
...
@@ -248,7 +248,7 @@ sub main {
-
wraplength
=>
"
200
",
-
text
=>
$warn
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]
);
);
$d
->
Show
();
if
(
!
defined
(
$tmp_settings
))
{
$ret
=
1
;
...
...
@@ -280,8 +280,7 @@ sub main {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Tests failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Tests failed!
',);
$d
->
Show
();
$ret
=
1
;
goto
bailout
;
...
...
@@ -347,8 +346,7 @@ sub main {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
400
",
-
text
=>
$worker_msg
->
{'
rmsg
'},
-
title
=>
'
Starting the download worker thread failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Starting the download worker thread failed!
',);
$d
->
Show
();
$self
->
{'
FIJITestsViewer
'}
->
{'
mw
'}
->
destroy
();
$ret
=
1
;
...
...
@@ -449,8 +447,7 @@ sub _export_test {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$rv
,
-
title
=>
"
Error saving tests.
",
-
buttons
=>
[
qw/OK/
]);
-
title
=>
"
Error saving tests.
",);
$d
->
Show
();
return
;
}
...
...
@@ -473,8 +470,7 @@ sub _export_gate_level_sim {
$logger
->
error
(
$rv
);
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$rv
,
-
title
=>
"
Error FIJI simulation model for gate-level simulation.
",
-
buttons
=>
[
qw/OK/
]);
-
title
=>
"
Error FIJI simulation model for gate-level simulation.
",);
$d
->
Show
();
return
;
}
...
...
@@ -497,8 +493,7 @@ sub _export_rtl_sim {
$logger
->
error
(
$rv
);
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$rv
,
-
title
=>
"
Error saving RTL simulation templates.
",
-
buttons
=>
[
qw/OK/
]);
-
title
=>
"
Error saving RTL simulation templates.
",);
$d
->
Show
();
return
;
}
...
...
@@ -549,8 +544,7 @@ sub _load_settings_prompt {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
(
!
defined
(
$tmp_settings
)
?
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'})
:
Tk::FIJIUtils::
alert_image
(
$self
->
{'
mw
'})),
-
wraplength
=>
"
200
",
-
text
=>
$warn
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Settings failed!
',);
$d
->
Show
();
}
}
...
...
@@ -664,8 +658,7 @@ sub _open_tests_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Tests failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Tests failed!
',);
$d
->
Show
();
return
;
}
...
...
@@ -675,8 +668,7 @@ sub _open_tests_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Tests failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Tests failed!
',);
$d
->
Show
();
return
;
}
...
...
@@ -711,8 +703,7 @@ sub _save_file {
$logger
->
error
(
$msg
);
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$msg
,
-
title
=>
'
Save failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Save failed!
',);
$d
->
Show
();
return
;
}
...
...
bin/fiji_setup.pl
View file @
5a577fc7
...
...
@@ -189,8 +189,7 @@ sub main {
),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Settings failed!
',);
$d
->
Show
()
if
!
$only_load
;
if
(
!
defined
(
$tmp_settings
))
{
$rv
=
1
;
...
...
@@ -203,8 +202,7 @@ sub main {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Settings failed!
',);
$d
->
Show
()
if
!
$only_load
;
$rv
=
1
;
goto
bailout
;
...
...
@@ -433,8 +431,7 @@ sub _open_settings_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Settings failed!
',);
$d
->
Show
();
return
;
}
...
...
@@ -447,8 +444,7 @@ sub _open_settings_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open FIJI Settings failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open FIJI Settings failed!
',);
$d
->
Show
();
return
;
}
elsif
(
ref
(
$rv
)
eq
"
FIJI::Settings
")
{
...
...
@@ -511,8 +507,7 @@ sub _load_netlist_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open netlist failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open netlist failed!
',);
$d
->
Show
();
undef
$do_splash
;
$splash
->
placeForget
();
...
...
@@ -530,8 +525,7 @@ sub _load_netlist_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
wraplength
=>
"
200
",
-
text
=>
$msg
,
-
title
=>
'
Open netlist failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Open netlist failed!
',);
$d
->
Show
();
undef
$do_splash
;
$splash
->
placeForget
();
...
...
@@ -630,8 +624,7 @@ sub _save_file {
my
$d
=
$self
->
{'
mw
'}
->
FIJIModalDialog
(
-
image
=>
Tk::FIJIUtils::
error_image
(
$self
->
{'
mw
'}),
-
text
=>
$msg
,
-
title
=>
'
Save failed!
',
-
buttons
=>
["
OK
"]);
-
title
=>
'
Save failed!
',);
$d
->
Show
();
return
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment