@@ -11,12 +11,12 @@ use cosmic::{
11
11
Element ,
12
12
} ;
13
13
14
- use crate :: { Config , Message } ;
14
+ use crate :: { fl , Config , Message } ;
15
15
16
16
pub fn menu_bar < ' a > ( config : & Config ) -> Element < ' a , Message > {
17
17
//TODO: port to libcosmic
18
18
let menu_root = |label| {
19
- widget:: button ( label)
19
+ widget:: button ( widget :: text ( label) )
20
20
. padding ( [ 4 , 12 ] )
21
21
. style ( theme:: Button :: MenuRoot )
22
22
} ;
@@ -36,84 +36,89 @@ pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> {
36
36
) ;
37
37
}
38
38
39
- let menu_folder = |label| menu_button ! ( label, horizontal_space( Length :: Fill ) , ">" ) ;
39
+ let menu_folder =
40
+ |label| menu_button ! ( widget:: text( label) , horizontal_space( Length :: Fill ) , ">" ) ;
40
41
41
- let menu_item = |label, message| MenuTree :: new ( menu_button ! ( label) . on_press ( message) ) ;
42
+ let menu_item =
43
+ |label, message| MenuTree :: new ( menu_button ! ( widget:: text( label) ) . on_press ( message) ) ;
42
44
43
45
let menu_key = |label, key, message| {
44
- MenuTree :: new ( menu_button ! ( label, horizontal_space( Length :: Fill ) , key) . on_press ( message) )
46
+ MenuTree :: new (
47
+ menu_button ! ( widget:: text( label) , horizontal_space( Length :: Fill ) , key)
48
+ . on_press ( message) ,
49
+ )
45
50
} ;
46
51
47
52
MenuBar :: new ( vec ! [
48
53
MenuTree :: with_children(
49
- menu_root( "File" ) ,
54
+ menu_root( fl! ( "file" ) ) ,
50
55
vec![
51
- menu_key( "New file", "Ctrl + N" , Message :: New ) ,
52
- menu_key( "New window", "Ctrl + Shift + N" , Message :: Todo ) ,
56
+ menu_key( fl! ( "new- file") , "Ctrl + N" , Message :: New ) ,
57
+ menu_key( fl! ( "new- window") , "Ctrl + Shift + N" , Message :: Todo ) ,
53
58
MenuTree :: new( horizontal_rule( 1 ) ) ,
54
- menu_key( "Open file..." , "Ctrl + O" , Message :: OpenFileDialog ) ,
59
+ menu_key( fl! ( "open- file" ) , "Ctrl + O" , Message :: OpenFileDialog ) ,
55
60
MenuTree :: with_children(
56
- menu_folder( "Open recent") ,
57
- vec![ menu_item( "TODO" , Message :: Todo ) ] ,
61
+ menu_folder( fl! ( "open- recent") ) ,
62
+ vec![ menu_item( fl! ( "todo" ) , Message :: Todo ) ] ,
58
63
) ,
59
64
MenuTree :: new( horizontal_rule( 1 ) ) ,
60
- menu_key( "Save" , "Ctrl + S" , Message :: Save ) ,
61
- menu_key( "Save as..." , "Ctrl + Shift + S" , Message :: Todo ) ,
65
+ menu_key( fl! ( "save" ) , "Ctrl + S" , Message :: Save ) ,
66
+ menu_key( fl! ( "save-as" ) , "Ctrl + Shift + S" , Message :: Todo ) ,
62
67
MenuTree :: new( horizontal_rule( 1 ) ) ,
63
- menu_item( "Revert all changes", Message :: Todo ) ,
68
+ menu_item( fl! ( "revert- all- changes") , Message :: Todo ) ,
64
69
MenuTree :: new( horizontal_rule( 1 ) ) ,
65
- menu_item( "Document statistics..." , Message :: Todo ) ,
66
- menu_item( "Document type..." , Message :: Todo ) ,
67
- menu_item( "Encoding..." , Message :: Todo ) ,
68
- menu_item( "Print" , Message :: Todo ) ,
70
+ menu_item( fl! ( "document- statistics" ) , Message :: Todo ) ,
71
+ menu_item( fl! ( "document- type" ) , Message :: Todo ) ,
72
+ menu_item( fl! ( "encoding" ) , Message :: Todo ) ,
73
+ menu_item( fl! ( "print" ) , Message :: Todo ) ,
69
74
MenuTree :: new( horizontal_rule( 1 ) ) ,
70
- menu_key( "Quit" , "Ctrl + Q" , Message :: Todo ) ,
75
+ menu_key( fl! ( "quit" ) , "Ctrl + Q" , Message :: Todo ) ,
71
76
] ,
72
77
) ,
73
78
MenuTree :: with_children(
74
- menu_root( "Edit" ) ,
79
+ menu_root( fl! ( "edit" ) ) ,
75
80
vec![
76
- menu_key( "Undo" , "Ctrl + Z" , Message :: Todo ) ,
77
- menu_key( "Redo" , "Ctrl + Shift + Z" , Message :: Todo ) ,
81
+ menu_key( fl! ( "undo" ) , "Ctrl + Z" , Message :: Todo ) ,
82
+ menu_key( fl! ( "redo" ) , "Ctrl + Shift + Z" , Message :: Todo ) ,
78
83
MenuTree :: new( horizontal_rule( 1 ) ) ,
79
- menu_key( "Cut" , "Ctrl + X" , Message :: Todo ) ,
80
- menu_key( "Copy" , "Ctrl + C" , Message :: Todo ) ,
81
- menu_key( "Paste" , "Ctrl + V" , Message :: Todo ) ,
84
+ menu_key( fl! ( "cut" ) , "Ctrl + X" , Message :: Todo ) ,
85
+ menu_key( fl! ( "copy" ) , "Ctrl + C" , Message :: Todo ) ,
86
+ menu_key( fl! ( "paste" ) , "Ctrl + V" , Message :: Todo ) ,
82
87
MenuTree :: new( horizontal_rule( 1 ) ) ,
83
- menu_key( "Find" , "Ctrl + F" , Message :: Todo ) ,
84
- menu_key( "Replace" , "Ctrl + H" , Message :: Todo ) ,
88
+ menu_key( fl! ( "find" ) , "Ctrl + F" , Message :: Todo ) ,
89
+ menu_key( fl! ( "replace" ) , "Ctrl + H" , Message :: Todo ) ,
85
90
MenuTree :: new( horizontal_rule( 1 ) ) ,
86
- menu_item( "Spell check..." , Message :: Todo ) ,
91
+ menu_item( fl! ( "spell- check" ) , Message :: Todo ) ,
87
92
] ,
88
93
) ,
89
94
MenuTree :: with_children(
90
- menu_root( "View" ) ,
95
+ menu_root( fl! ( "view" ) ) ,
91
96
vec![
92
97
MenuTree :: with_children(
93
- menu_folder( "Indentation" ) ,
98
+ menu_folder( fl! ( "indentation" ) ) ,
94
99
vec![
95
- menu_item( "Automatic indentation", Message :: Todo ) ,
100
+ menu_item( fl! ( "automatic- indentation") , Message :: Todo ) ,
96
101
MenuTree :: new( horizontal_rule( 1 ) ) ,
97
- menu_item( "Tab width: 1" , Message :: Todo ) ,
98
- menu_item( "Tab width: 2" , Message :: Todo ) ,
99
- menu_item( "Tab width: 4" , Message :: Todo ) ,
100
- menu_item( "Tab width: 8" , Message :: Todo ) ,
102
+ menu_item( fl! ( "tab- width" , tab_width = 1 ) , Message :: Todo ) ,
103
+ menu_item( fl! ( "tab- width" , tab_width = 2 ) , Message :: Todo ) ,
104
+ menu_item( fl! ( "tab- width" , tab_width = 4 ) , Message :: Todo ) ,
105
+ menu_item( fl! ( "tab- width" , tab_width = 8 ) , Message :: Todo ) ,
101
106
MenuTree :: new( horizontal_rule( 1 ) ) ,
102
- menu_item( "Convert indentation to spaces", Message :: Todo ) ,
103
- menu_item( "Convert indentation to tabs", Message :: Todo ) ,
107
+ menu_item( fl! ( "convert- indentation-to- spaces") , Message :: Todo ) ,
108
+ menu_item( fl! ( "convert- indentation-to- tabs") , Message :: Todo ) ,
104
109
] ,
105
110
) ,
106
111
MenuTree :: new( horizontal_rule( 1 ) ) ,
107
- menu_item( "Word wrap", Message :: Todo ) ,
108
- menu_item( "Show line numbers", Message :: Todo ) ,
109
- menu_item( "Highlight current line", Message :: Todo ) ,
110
- menu_item( "Syntax highlighting..." , Message :: Todo ) ,
112
+ menu_item( fl! ( "word- wrap") , Message :: Todo ) ,
113
+ menu_item( fl! ( "show- line- numbers") , Message :: Todo ) ,
114
+ menu_item( fl! ( "highlight- current- line") , Message :: Todo ) ,
115
+ menu_item( fl! ( "syntax- highlighting" ) , Message :: Todo ) ,
111
116
MenuTree :: new( horizontal_rule( 1 ) ) ,
112
- menu_key( "Settings..." , "Ctrl + ," , Message :: Todo ) ,
117
+ menu_key( fl! ( "settings" ) , "Ctrl + ," , Message :: Todo ) ,
113
118
MenuTree :: new( horizontal_rule( 1 ) ) ,
114
- menu_item( "Keyboard shortcuts..." , Message :: Todo ) ,
119
+ menu_item( fl! ( "keyboard- shortcuts" ) , Message :: Todo ) ,
115
120
MenuTree :: new( horizontal_rule( 1 ) ) ,
116
- menu_item( "About COSMIC Text Editor" , Message :: Todo ) ,
121
+ menu_item( fl! ( "about-cosmic-text-editor" ) , Message :: Todo ) ,
117
122
] ,
118
123
) ,
119
124
] )
0 commit comments