Skip to content

Commit

Permalink
git subrepo pull (merge) uno
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "uno"
  merged:   "93c46920"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "93c46920"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
  • Loading branch information
prrvchr committed Oct 27, 2024
1 parent b1a75eb commit b1d23f3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = a3c35e058b4a72c3111aa5dd53fd4d4b64238f73
parent = b618b0d6bf0a3c6fb491f22a17f3761a4e6f939a
commit = 93c46920fd09d0310553b13be3e0505b9275d7b4
parent = b1a75ebb0395d0c6bd70f01bfd525613d87b06b8
method = merge
cmdver = 0.4.3
16 changes: 8 additions & 8 deletions uno/dialog/card/OptionsDialog.xdl
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<dlg:style dlg:style-id="0" dlg:font-weight="150"/>
</dlg:styles>
<dlg:bulletinboard>
<dlg:fixedline dlg:style-id="0" dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="63" dlg:width="244" dlg:height="14" dlg:help-text="&amp;OptionsDialog.FixedLine1.HelpText" dlg:value="&amp;OptionsDialog.FixedLine1.Label"/>
<dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="80" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="2" dlg:left="100" dlg:top="80" dlg:width="20" dlg:height="15" dlg:help-text="&amp;OptionsDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="10" dlg:top="100" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:valign="center"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="4" dlg:disabled="true" dlg:left="100" dlg:top="100" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
<dlg:fixedline dlg:style-id="0" dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="64" dlg:width="244" dlg:height="14" dlg:help-text="&amp;OptionsDialog.FixedLine1.HelpText" dlg:value="&amp;OptionsDialog.FixedLine1.Label"/>
<dlg:text dlg:id="Label1" dlg:tab-index="1" dlg:left="10" dlg:top="81" dlg:width="80" dlg:height="18" dlg:help-text="&amp;OptionsDialog.Label1.HelpText" dlg:value="&amp;OptionsDialog.Label1.Label" dlg:valign="center"/>
<dlg:numericfield dlg:id="NumericField1" dlg:tab-index="2" dlg:left="100" dlg:top="81" dlg:width="20" dlg:height="18" dlg:help-text="&amp;OptionsDialog.NumericField1.HelpText" dlg:decimal-accuracy="0" dlg:value-min="5" dlg:value-max="1440"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="10" dlg:top="102" dlg:width="80" dlg:height="18" dlg:help-text="&amp;OptionsDialog.Label2.HelpText" dlg:value="&amp;OptionsDialog.Label2.Label" dlg:valign="center"/>
<dlg:button dlg:id="CommandButton1" dlg:tab-index="4" dlg:disabled="true" dlg:left="100" dlg:top="102" dlg:width="100" dlg:height="18" dlg:help-text="&amp;OptionsDialog.CommandButton1.HelpText" dlg:value="&amp;OptionsDialog.CommandButton1.Label">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:ViewData" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="10" dlg:top="120" dlg:width="80" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
<dlg:textfield dlg:id="TextField1" dlg:tab-index="6" dlg:left="100" dlg:top="120" dlg:width="100" dlg:height="15" dlg:help-text="&amp;OptionsDialog.TextField1.HelpText" dlg:value="&amp;OptionsDialog.TextField1.Text"/>
<dlg:text dlg:style-id="0" dlg:id="Label4" dlg:tab-index="7" dlg:left="10" dlg:top="145" dlg:width="240" dlg:height="15" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="center" dlg:valign="center"/>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="10" dlg:top="123" dlg:width="80" dlg:height="18" dlg:help-text="&amp;OptionsDialog.Label3.HelpText" dlg:value="&amp;OptionsDialog.Label3.Label" dlg:valign="center"/>
<dlg:textfield dlg:id="TextField1" dlg:tab-index="6" dlg:left="100" dlg:top="123" dlg:width="100" dlg:height="18" dlg:help-text="&amp;OptionsDialog.TextField1.HelpText" dlg:value="&amp;OptionsDialog.TextField1.Text"/>
<dlg:text dlg:style-id="0" dlg:id="Label4" dlg:tab-index="7" dlg:left="10" dlg:top="148" dlg:width="240" dlg:height="18" dlg:help-text="&amp;OptionsDialog.Label4.HelpText" dlg:value="&amp;OptionsDialog.Label4.Label" dlg:align="center" dlg:valign="center"/>
</dlg:bulletinboard>
</dlg:window>

0 comments on commit b1d23f3

Please sign in to comment.