Skip to content

Commit bcf126a

Browse files
jobisoftjobisoft
committed
more UI fixes
1 parent a03154f commit bcf126a

File tree

1 file changed

+87
-88
lines changed

1 file changed

+87
-88
lines changed

‎chrome/content/settings.xhtml

Lines changed: 87 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
<fieldset flex="1">
186186
<vbox flex="1">
187187
<hbox><legend class="insideTab" id="text-caption">&quicktext.template.label;</legend></hbox>
188+
188189
<html:table>
189190
<html:tr showfor="text,group">
190191
<html:td width="80">
@@ -196,96 +197,94 @@
196197
<hbox class="input-container"><html:input id="text-title" disabled="true" candisable="true" oninput="quicktext.checkForTextChanges(0);"/></hbox>
197198
</html:td>
198199
</html:tr>
200+
</html:table>
199201

200-
<html:tr showfor="text">
201-
<html:td width="80">
202-
<hbox align="right" >
203-
<vbox height="20px">
204-
<menu label="&quicktext.variables.label;" id="text-variables" disabled="true" flex="1" showfor="text" candisable="true">
205-
<menupopup>
206-
<menu label="&quicktext.to.label;">
207-
<menupopup>
208-
<menuitem label="&quicktext.firstname.label;" oncommand="quicktext.insertVariable('TO=firstname');" />
209-
<menuitem label="&quicktext.lastname.label;" oncommand="quicktext.insertVariable('TO=lastname');" />
210-
<menuitem label="&quicktext.fullname.label;" oncommand="quicktext.insertVariable('TO=fullname');" />
211-
<menuitem label="&quicktext.displayname.label;" oncommand="quicktext.insertVariable('TO=displayname');" />
212-
<menuitem label="&quicktext.nickname.label;" oncommand="quicktext.insertVariable('TO=nickname');" />
213-
<menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('TO=email');" />
214-
<menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('TO=workphone');" />
215-
<menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('TO=faxnumber');" />
216-
<menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('TO=cellularnumber');" />
217-
<menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('TO=jobtitle');" />
218-
<menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('TO=custom1');" />
219-
<menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('TO=custom2');" />
220-
<menuitem label="&quicktext.custom3.label;" oncommand="quicktext.insertVariable('TO=custom3');" />
221-
<menuitem label="&quicktext.custom4.label;" oncommand="quicktext.insertVariable('TO=custom4');" />
222-
</menupopup>
223-
</menu>
224-
<menu label="&quicktext.from.label;">
225-
<menupopup>
226-
<menuitem label="&quicktext.firstname.label;" oncommand="quicktext.insertVariable('FROM=firstname');" />
227-
<menuitem label="&quicktext.lastname.label;" oncommand="quicktext.insertVariable('FROM=lastname');" />
228-
<menuitem label="&quicktext.fullname.label;" oncommand="quicktext.insertVariable('FROM=fullname');" />
229-
<menuitem label="&quicktext.displayname.label;" oncommand="quicktext.insertVariable('FROM=displayname');" />
230-
<menuitem label="&quicktext.nickname.label;" oncommand="quicktext.insertVariable('FROM=nickname');" />
231-
<menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('FROM=email');" />
232-
<menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('FROM=workphone');" />
233-
<menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('FROM=faxnumber');" />
234-
<menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('FROM=cellularnumber');" />
235-
<menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('FROM=jobtitle');" />
236-
<menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('FROM=custom1');" />
237-
<menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('FROM=custom2');" />
238-
<menuitem label="&quicktext.custom3.label;" oncommand="quicktext.insertVariable('FROM=custom3');" />
239-
<menuitem label="&quicktext.custom4.label;" oncommand="quicktext.insertVariable('FROM=custom4');" />
240-
</menupopup>
241-
</menu>
242-
<menu label="&quicktext.attachments.label;">
243-
<menupopup>
244-
<menuitem label="&quicktext.filename.label;" oncommand="quicktext.insertVariable('ATT=name');" />
245-
<menuitem label="&quicktext.filenameAndSize.label;" oncommand="quicktext.insertVariable('ATT=full');" />
246-
</menupopup>
247-
</menu>
248-
<menu label="&quicktext.dateTime.label;">
249-
<menupopup>
250-
<menuitem id="date-short" oncommand="quicktext.insertVariable('DATE');" />
251-
<menuitem id="date-long" oncommand="quicktext.insertVariable('DATE=long');" />
252-
<menuitem id="date-monthname" oncommand="quicktext.insertVariable('DATE=monthname');" />
253-
<menuitem id="time-noseconds" oncommand="quicktext.insertVariable('TIME');" />
254-
<menuitem id="time-seconds" oncommand="quicktext.insertVariable('TIME=seconds');" />
255-
</menupopup>
256-
</menu>
257-
<menu label="&quicktext.other.label;">
258-
<menupopup>
259-
<menuitem label="&quicktext.clipboard.label;" oncommand="quicktext.insertVariable('CLIPBOARD');" />
260-
<menuitem label="&quicktext.counter.label;" oncommand="quicktext.insertVariable('COUNTER');" />
261-
<menuitem label="&quicktext.input.label;" oncommand="quicktext.insertVariable('INPUT=name|type|options');" />
262-
<menuitem label="&quicktext.selection.label;" oncommand="quicktext.insertVariable('SELECTION');" />
263-
<menuitem label="&quicktext.orgatt.label;" oncommand="quicktext.insertVariable('ORGATT=\\n');" />
264-
<menuitem label="&quicktext.orgheader.label;" oncommand="quicktext.insertVariable('ORGHEADER=type|\\n');" />
265-
<menuitem label="&quicktext.subject.label;" oncommand="quicktext.insertVariable('SUBJECT');" />
266-
<menuitem label="&quicktext.url.label;" oncommand="quicktext.insertVariable('URL=url|data');" />
267-
<menuitem label="&quicktext.insertfile.label;" oncommand="quicktext.insertFileVariable();" />
268-
<menuitem label="&quicktext.image.label;" oncommand="quicktext.insertImageVariable();" />
269-
<menuitem label="&quicktext.version.label;" oncommand="quicktext.insertVariable('VERSION');" />
270-
<menuseparator/>
271-
<menuitem label="&quicktext.header.label;" oncommand="quicktext.insertVariable('HEADER=type|value');" />
272-
<menuitem label="&quicktext.cursor.label;" oncommand="quicktext.insertVariable('CURSOR');" />
273-
</menupopup>
274-
</menu>
275-
<menu label="&quicktext.templates.label;" id="quicktext-other-texts" />
276-
<menu label="&quicktext.scripts.label;" id="variables-scripts" />
277-
</menupopup>
278-
</menu>
279-
</vbox>
280-
</hbox>
281-
</html:td>
282-
<html:td>
283-
<vbox class="textarea-container" flex="1">
284-
<html:textarea id="text" rows="10" disabled="true" candisable="true" wrap="on" oninput="quicktext.checkForTextChanges(1);"/>
285-
</vbox>
286-
</html:td>
287-
</html:tr>
202+
<hbox pack="end" >
203+
<vbox flex="1"></vbox>
204+
<vbox>
205+
<menu label="&quicktext.variables.label;" id="text-variables" disabled="true" flex="1" showfor="text" candisable="true">
206+
<menupopup>
207+
<menu label="&quicktext.to.label;">
208+
<menupopup>
209+
<menuitem label="&quicktext.firstname.label;" oncommand="quicktext.insertVariable('TO=firstname');" />
210+
<menuitem label="&quicktext.lastname.label;" oncommand="quicktext.insertVariable('TO=lastname');" />
211+
<menuitem label="&quicktext.fullname.label;" oncommand="quicktext.insertVariable('TO=fullname');" />
212+
<menuitem label="&quicktext.displayname.label;" oncommand="quicktext.insertVariable('TO=displayname');" />
213+
<menuitem label="&quicktext.nickname.label;" oncommand="quicktext.insertVariable('TO=nickname');" />
214+
<menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('TO=email');" />
215+
<menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('TO=workphone');" />
216+
<menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('TO=faxnumber');" />
217+
<menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('TO=cellularnumber');" />
218+
<menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('TO=jobtitle');" />
219+
<menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('TO=custom1');" />
220+
<menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('TO=custom2');" />
221+
<menuitem label="&quicktext.custom3.label;" oncommand="quicktext.insertVariable('TO=custom3');" />
222+
<menuitem label="&quicktext.custom4.label;" oncommand="quicktext.insertVariable('TO=custom4');" />
223+
</menupopup>
224+
</menu>
225+
<menu label="&quicktext.from.label;">
226+
<menupopup>
227+
<menuitem label="&quicktext.firstname.label;" oncommand="quicktext.insertVariable('FROM=firstname');" />
228+
<menuitem label="&quicktext.lastname.label;" oncommand="quicktext.insertVariable('FROM=lastname');" />
229+
<menuitem label="&quicktext.fullname.label;" oncommand="quicktext.insertVariable('FROM=fullname');" />
230+
<menuitem label="&quicktext.displayname.label;" oncommand="quicktext.insertVariable('FROM=displayname');" />
231+
<menuitem label="&quicktext.nickname.label;" oncommand="quicktext.insertVariable('FROM=nickname');" />
232+
<menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('FROM=email');" />
233+
<menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('FROM=workphone');" />
234+
<menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('FROM=faxnumber');" />
235+
<menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('FROM=cellularnumber');" />
236+
<menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('FROM=jobtitle');" />
237+
<menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('FROM=custom1');" />
238+
<menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('FROM=custom2');" />
239+
<menuitem label="&quicktext.custom3.label;" oncommand="quicktext.insertVariable('FROM=custom3');" />
240+
<menuitem label="&quicktext.custom4.label;" oncommand="quicktext.insertVariable('FROM=custom4');" />
241+
</menupopup>
242+
</menu>
243+
<menu label="&quicktext.attachments.label;">
244+
<menupopup>
245+
<menuitem label="&quicktext.filename.label;" oncommand="quicktext.insertVariable('ATT=name');" />
246+
<menuitem label="&quicktext.filenameAndSize.label;" oncommand="quicktext.insertVariable('ATT=full');" />
247+
</menupopup>
248+
</menu>
249+
<menu label="&quicktext.dateTime.label;">
250+
<menupopup>
251+
<menuitem id="date-short" oncommand="quicktext.insertVariable('DATE');" />
252+
<menuitem id="date-long" oncommand="quicktext.insertVariable('DATE=long');" />
253+
<menuitem id="date-monthname" oncommand="quicktext.insertVariable('DATE=monthname');" />
254+
<menuitem id="time-noseconds" oncommand="quicktext.insertVariable('TIME');" />
255+
<menuitem id="time-seconds" oncommand="quicktext.insertVariable('TIME=seconds');" />
256+
</menupopup>
257+
</menu>
258+
<menu label="&quicktext.other.label;">
259+
<menupopup>
260+
<menuitem label="&quicktext.clipboard.label;" oncommand="quicktext.insertVariable('CLIPBOARD');" />
261+
<menuitem label="&quicktext.counter.label;" oncommand="quicktext.insertVariable('COUNTER');" />
262+
<menuitem label="&quicktext.input.label;" oncommand="quicktext.insertVariable('INPUT=name|type|options');" />
263+
<menuitem label="&quicktext.selection.label;" oncommand="quicktext.insertVariable('SELECTION');" />
264+
<menuitem label="&quicktext.orgatt.label;" oncommand="quicktext.insertVariable('ORGATT=\\n');" />
265+
<menuitem label="&quicktext.orgheader.label;" oncommand="quicktext.insertVariable('ORGHEADER=type|\\n');" />
266+
<menuitem label="&quicktext.subject.label;" oncommand="quicktext.insertVariable('SUBJECT');" />
267+
<menuitem label="&quicktext.url.label;" oncommand="quicktext.insertVariable('URL=url|data');" />
268+
<menuitem label="&quicktext.insertfile.label;" oncommand="quicktext.insertFileVariable();" />
269+
<menuitem label="&quicktext.image.label;" oncommand="quicktext.insertImageVariable();" />
270+
<menuitem label="&quicktext.version.label;" oncommand="quicktext.insertVariable('VERSION');" />
271+
<menuseparator/>
272+
<menuitem label="&quicktext.header.label;" oncommand="quicktext.insertVariable('HEADER=type|value');" />
273+
<menuitem label="&quicktext.cursor.label;" oncommand="quicktext.insertVariable('CURSOR');" />
274+
</menupopup>
275+
</menu>
276+
<menu label="&quicktext.templates.label;" id="quicktext-other-texts" />
277+
<menu label="&quicktext.scripts.label;" id="variables-scripts" />
278+
</menupopup>
279+
</menu>
280+
</vbox>
281+
</hbox>
282+
283+
<vbox class="textarea-container" style="display:flex; flex-direction: column;" flex="1">
284+
<html:textarea id="text" showfor="text" style="font-family:Consolas,Courier New,monospace; flex:1" disabled="true" candisable="true" wrap="on" oninput="quicktext.checkForTextChanges(1);"/>
285+
</vbox>
288286

287+
<html:table>
289288
<html:tr showfor="text">
290289
<html:td width="80">
291290
<label align="center" value="&quicktext.insertAs.label;:" control="text-type" style="margin-top: 6px" />

0 commit comments

Comments
 (0)