Skip to content

Commit d357347

Browse files
Merge branch 'topic/gtkada_dialogs' into 'master'
Add 'Don't Show Again' button to Gtkada dialogs See merge request eng/ide/gtkada!18
2 parents 5dbc4f1 + 9cdaeaf commit d357347

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

src/gtkada-dialogs.adb

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,20 @@ with Gtkada.Pixmaps; use Gtkada.Pixmaps;
4141

4242
package body Gtkada.Dialogs is
4343

44-
subtype String_6 is String (1 .. 6);
44+
subtype String_16 is String (1 .. 16);
4545
type String_Const_Ptr is access constant String;
4646

47-
Dialog_Button_String : constant array (Button_Range) of String_6 :=
48-
("Yes ",
49-
"No ",
50-
"All ",
51-
"OK ",
52-
"Cancel",
53-
"Abort ",
54-
"Retry ",
55-
"Ignore",
56-
"Help ");
47+
Dialog_Button_String : constant array (Button_Range) of String_16 :=
48+
("Yes ",
49+
"No ",
50+
"All ",
51+
"OK ",
52+
"Cancel ",
53+
"Abort ",
54+
"Retry ",
55+
"Ignore ",
56+
"Help ",
57+
"Don't Show Again");
5758

5859
Yes : aliased constant String := "gtk-yes";
5960
No : aliased constant String := "gtk-no";
@@ -73,7 +74,8 @@ package body Gtkada.Dialogs is
7374
null,
7475
null,
7576
null,
76-
Help'Access);
77+
Help'Access,
78+
null);
7779

7880
--------------------
7981
-- Message_Dialog --
@@ -174,13 +176,14 @@ package body Gtkada.Dialogs is
174176

175177
case Result is
176178
when Button_Yes
177-
| Button_No
178-
| Button_All
179-
| Button_OK
180-
| Button_Cancel
181-
| Button_Abort
182-
| Button_Retry
183-
| Button_Ignore =>
179+
| Button_No
180+
| Button_All
181+
| Button_OK
182+
| Button_Cancel
183+
| Button_Abort
184+
| Button_Retry
185+
| Button_Ignore
186+
| Button_Dont_Show_Again =>
184187

185188
Destroy (Dialog);
186189
return Result;

src/gtkada-dialogs.ads

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,20 @@ package Gtkada.Dialogs is
4141
type Message_Dialog_Buttons is mod 2 ** 32;
4242
-- Define the set of values a button in a message dialog box can have.
4343

44-
type Button_Range is range 0 .. 8;
44+
type Button_Range is range 0 .. 9;
4545
-- The range of valid buttons.
4646

47-
Button_None : constant Message_Dialog_Buttons := 0;
48-
Button_Yes : constant Message_Dialog_Buttons := 2 ** 0;
49-
Button_No : constant Message_Dialog_Buttons := 2 ** 1;
50-
Button_All : constant Message_Dialog_Buttons := 2 ** 2;
51-
Button_OK : constant Message_Dialog_Buttons := 2 ** 3;
52-
Button_Cancel : constant Message_Dialog_Buttons := 2 ** 4;
53-
Button_Abort : constant Message_Dialog_Buttons := 2 ** 5;
54-
Button_Retry : constant Message_Dialog_Buttons := 2 ** 6;
55-
Button_Ignore : constant Message_Dialog_Buttons := 2 ** 7;
56-
Button_Help : constant Message_Dialog_Buttons := 2 ** 8;
47+
Button_None : constant Message_Dialog_Buttons := 0;
48+
Button_Yes : constant Message_Dialog_Buttons := 2 ** 0;
49+
Button_No : constant Message_Dialog_Buttons := 2 ** 1;
50+
Button_All : constant Message_Dialog_Buttons := 2 ** 2;
51+
Button_OK : constant Message_Dialog_Buttons := 2 ** 3;
52+
Button_Cancel : constant Message_Dialog_Buttons := 2 ** 4;
53+
Button_Abort : constant Message_Dialog_Buttons := 2 ** 5;
54+
Button_Retry : constant Message_Dialog_Buttons := 2 ** 6;
55+
Button_Ignore : constant Message_Dialog_Buttons := 2 ** 7;
56+
Button_Help : constant Message_Dialog_Buttons := 2 ** 8;
57+
Button_Dont_Show_Again : constant Message_Dialog_Buttons := 2 ** 9;
5758

5859
type Message_Dialog_Type is
5960
(Warning,

0 commit comments

Comments
 (0)