Skip to content

Commit 3234101

Browse files
jeremypwjeremypw
authored
Merge branch 'master' into jeremypw/fix-global-search-matches
2 parents f6cebfa + d065ae9 commit 3234101

File tree

625 files changed

+12075
-7604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

625 files changed

+12075
-7604
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
image: ghcr.io/elementary/docker:${{ matrix.version }}
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
- name: Install Dependencies
2323
run: |
2424
apt update
@@ -50,7 +50,7 @@ jobs:
5050

5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v5
53+
uses: actions/checkout@v6
5454

5555
- name: Build
5656
uses: flatpak/flatpak-github-actions/[email protected]
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v5
74+
uses: actions/checkout@v6
7575

7676
- name: Lint
7777
run: io.elementary.vala-lint -d .

‎.github/workflows/merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Clone repository
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313
with:
1414
token: ${{ secrets.GIT_USER_TOKEN }}
1515

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- uses: elementary/actions/release@main
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

‎data/meson.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ endforeach
1616
install_data([
1717
'styles/elementary-dark.xml',
1818
'styles/elementary-light.xml',
19+
'styles/elementary-highcontrast-light.xml',
1920
], install_dir: get_option('datadir') / 'gtksourceview-4' / 'styles')
2021

2122
install_data([

‎data/styles/elementary-highcontrast-light.xml‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<style-scheme id="elementary-highcontrast-light" _name="elementary High Contrast Light" version="1.0">
4+
<author>Elementary Developers</author>
5+
<_description>High Contrast color scheme using the elementary color palette</_description>
6+
7+
<!-- Background Colors Palette -->
8+
<color name="bg-0" value="#abacae"/> <!-- SILVER700-->
9+
<color name="bg-1" value="#d4d4d4"/> <!-- SILVER300-->
10+
<color name="bg-2" value="#fafafa"/> <!-- SILVER100-->
11+
<color name="bg-3" value="#EAEAEA"/> <!-- 50% SILVER300 + 50% WHITE
12+
13+
-->
14+
15+
<!--Foreground Colors Palette -->
16+
<color name="fg-0" value="#000000"/> <!-- BLACK900 -->
17+
<color name="fg-1" value="#1a1a1a"/> <!-- BLACK700 -->
18+
<color name="fg-2" value="#abacae"/> <!-- SILVER500 -->
19+
20+
<!--Highlight Colors Palette -->
21+
<color name="mud" value="#804b00"/> <!-- LATTE900 -->
22+
<color name="latte" value="#e7c591"/> <!-- LATTE300 -->
23+
<color name="yellow" value="#d48e15"/> <!-- BANANA700 -->
24+
<color name="orange" value="#cc3b02"/> <!-- ORANGE700 -->
25+
<color name="pink" value="#bc245d"/> <!-- BUBBLEGUM700 -->
26+
<color name="purple" value="#452981"/> <!-- GRAPE900 -->
27+
<color name="cyan" value="#007367"/> <!-- MINT900 -->
28+
<color name="blue" value="#0d52bf"/> <!-- BLUEBERRY700 -->
29+
<color name="lime" value="#68b723"/> <!-- LIME500 -->
30+
<color name="green" value="#206b00"/> <!-- LIME900 -->
31+
<color name="red" value="#a10705"/> <!-- STRAWBERRY700 -->
32+
<color name="black" value="#000000"/>
33+
34+
35+
<!-- Global Settings -->
36+
<style name="text" foreground="fg-0" background="bg-2"/>
37+
<style name="selection" background="latte"/>
38+
<style name="cursor" foreground="fg-0"/>
39+
<style name="secondary-cursor" foreground="fg-1"/>
40+
<style name="current-line" background="bg-1"/>
41+
<style name="line-numbers" foreground="fg-1" background="bg-3"/>
42+
<style name="background-pattern" background="bg-3"/>
43+
<style name="draw-spaces" foreground="fg-2"/>
44+
45+
<!-- Bracket Matching -->
46+
<style name="bracket-match" foreground="lime" background="bg-2" bold="true"/>
47+
<style name="bracket-mismatch" foreground="red" background="fg-2" bold="true"/>
48+
49+
<!-- Right Margin -->
50+
<style name="right-margin" foreground="bg-3" background="fg-1"/>
51+
52+
<!-- Search Matching -->
53+
<style name="search-match" foreground="black" background="yellow"/>
54+
55+
<!-- Comments -->
56+
<style name="def:comment" foreground="blue" italic="true"/>
57+
<style name="def:shebang" foreground="fg-1" bold="true"/>
58+
<style name="def:doc-comment-element" italic="true"/>
59+
60+
<!-- Constants -->
61+
<style name="def:constant" foreground="cyan"/>
62+
<style name="def:special-char" foreground="green"/>
63+
64+
<!-- Identifiers -->
65+
<style name="def:identifier" foreground="blue" bold="true"/>
66+
67+
<!-- Statements -->
68+
<style name="def:statement" foreground="orange"/>
69+
70+
<!-- Types -->
71+
<style name="def:type" foreground="green" bold="true"/>
72+
<style name="def:string" foreground="pink"/>
73+
<style name="def:keyword" foreground="mud" bold="true"/>
74+
75+
<!-- Markup -->
76+
<style name="def:emphasis" italic="true"/>
77+
<style name="def:strong-emphasis" foreground="orange"/>
78+
<style name="def:inline-code" foreground="blue"/>
79+
<style name="def:insertion" underline="single"/>
80+
<style name="def:deletion" strikethrough="true"/>
81+
<style name="def:link-text" foreground="fg-1"/>
82+
<style name="def:link-symbol" foreground="fg-1" bold="true"/>
83+
<style name="def:link-destination" italic="true" underline="single"/>
84+
<style name="def:heading" foreground="yellow"/>
85+
<style name="def:thematic-break" foreground="yellow"/>
86+
<style name="def:preformatted-section" foreground="blue"/>
87+
<style name="def:list-marker" foreground="orange"/>
88+
89+
<!-- Operators -->
90+
<style name="def:operator" foreground="lime" bold="true" />
91+
92+
<!-- Others -->
93+
<style name="def:preprocessor" foreground="purple"/>
94+
<style name="def:error" foreground="red" bold="true"/>
95+
<style name="def:note" foreground="pink" bold="true"/>
96+
<style name="def:net-address" italic="true" underline="single"/>
97+
98+
<!-- Language specific styles -->
99+
<style name="diff:added-line" foreground="green"/>
100+
<style name="diff:removed-line" foreground="red"/>
101+
<style name="diff:changed-line" foreground="yellow"/>
102+
<style name="diff:special-case" use-style="def:constant"/>
103+
<style name="diff:location" use-style="def:statement"/>
104+
<style name="diff:diff-file" use-style="def:type"/>
105+
106+
<style name="xml:tags" foreground="cyan" bold="true"/>
107+
<style name="xml:attribute-name" foreground="purple" bold="true"/>
108+
<style name="xml:namespace" foreground="lime" bold="true"/>
109+
110+
<style name="js:built-in-constructor" use-style="def:identifier"/>
111+
112+
<style name="latex:display-math" foreground="purple"/>
113+
<style name="latex:command" foreground="green" bold="true"/>
114+
<style name="latex:include" use-style="def:preprocessor"/>
115+
116+
<style name="sh:variable" foreground="purple"/>
117+
118+
<!-- legacy styles for old lang files -->
119+
<style name="Others" foreground="green" bold="true"/>
120+
<style name="Others 2" foreground="cyan"/>
121+
<style name="Others 3" foreground="purple"/>
122+
123+
</style-scheme>

‎plugins/pastebin/pastebin.vala‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Scratch.Services.Act
7979
GLib.MenuItem? menuitem = null;
8080
GLib.Menu? share_menu = null;
8181
public Object object { owned get; set construct; }
82+
Dialogs.PasteBinDialog? pastebin_dialog = null;
8283

8384
Scratch.Services.Document? doc = null;
8485
Scratch.Services.Interface plugins;
@@ -142,8 +143,15 @@ public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Scratch.Services.Act
142143
}
143144

144145
void show_paste_bin_upload_dialog () {
145-
MainWindow window = plugins.manager.window;
146-
new Dialogs.PasteBinDialog (window, doc);
146+
if (pastebin_dialog != null) {
147+
pastebin_dialog.present ();
148+
} else {
149+
MainWindow window = plugins.manager.window;
150+
pastebin_dialog = new Dialogs.PasteBinDialog (window, doc);
151+
pastebin_dialog.destroy.connect (() => {
152+
pastebin_dialog = null;
153+
});
154+
}
147155
}
148156

149157
public void deactivate () {

‎po/LINGUAS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,4 @@ gn
200200
an
201201
zh_HANT
202202
zh_HANS
203+
zh_Hant

‎po/aa.po‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-11-10 12:52+0000\n"
5+
"POT-Creation-Date: 2025-11-18 12:15+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
msgid "New Tab"
1818
msgstr ""
1919

20-
#: src/Application.vala:42 src/FolderManager/FileItem.vala:87
20+
#: src/Application.vala:42 src/FolderManager/FileItem.vala:85
2121
msgid "New Window"
2222
msgstr ""
2323

@@ -74,7 +74,7 @@ msgstr ""
7474
msgid "Hide Terminal"
7575
msgstr ""
7676

77-
#: src/MainWindow.vala:448 src/Widgets/HeaderBar.vala:196
77+
#: src/MainWindow.vala:448 src/Widgets/HeaderBar.vala:195
7878
msgid "Show Terminal"
7979
msgstr ""
8080

@@ -228,7 +228,7 @@ msgstr ""
228228
msgid "Create Branch"
229229
msgstr ""
230230

231-
#: src/Dialogs/PreferencesDialog.vala:15 src/Widgets/HeaderBar.vala:218
231+
#: src/Dialogs/PreferencesDialog.vala:15 src/Widgets/HeaderBar.vala:217
232232
msgid "Preferences"
233233
msgstr ""
234234

@@ -428,11 +428,11 @@ msgstr ""
428428
msgid "Move to Trash"
429429
msgstr ""
430430

431-
#: src/FolderManager/FileItem.vala:100 src/FolderManager/FolderItem.vala:198
431+
#: src/FolderManager/FileItem.vala:98 src/FolderManager/FolderItem.vala:196
432432
msgid "Other Application…"
433433
msgstr ""
434434

435-
#: src/FolderManager/FileItem.vala:115 src/FolderManager/FolderItem.vala:218
435+
#: src/FolderManager/FileItem.vala:113 src/FolderManager/FolderItem.vala:216
436436
msgid "Open In"
437437
msgstr ""
438438

@@ -444,31 +444,31 @@ msgstr ""
444444
msgid "Find in Folder…"
445445
msgstr ""
446446

447-
#: src/FolderManager/FolderItem.vala:189
447+
#: src/FolderManager/FolderItem.vala:187
448448
msgid "Terminal Pane"
449449
msgstr ""
450450

451-
#: src/FolderManager/FolderItem.vala:224
451+
#: src/FolderManager/FolderItem.vala:222
452452
msgid "Folder"
453453
msgstr ""
454454

455-
#: src/FolderManager/FolderItem.vala:232
455+
#: src/FolderManager/FolderItem.vala:230
456456
msgid "Empty File"
457457
msgstr ""
458458

459459
#. scan all children
460460
#. No need to show status when children shown
461-
#: src/FolderManager/FolderItem.vala:243
462-
#: src/FolderManager/ProjectFolderItem.vala:427
463-
#: src/FolderManager/ProjectFolderItem.vala:433
461+
#: src/FolderManager/FolderItem.vala:241
462+
#: src/FolderManager/ProjectFolderItem.vala:425
463+
#: src/FolderManager/ProjectFolderItem.vala:431
464464
msgid "New"
465465
msgstr ""
466466

467-
#: src/FolderManager/FolderItem.vala:399
467+
#: src/FolderManager/FolderItem.vala:397
468468
msgid "untitled folder"
469469
msgstr ""
470470

471-
#: src/FolderManager/FolderItem.vala:399
471+
#: src/FolderManager/FolderItem.vala:397
472472
msgid "new file"
473473
msgstr ""
474474

@@ -513,27 +513,27 @@ msgstr[1] ""
513513
msgid "Find in Project…"
514514
msgstr ""
515515

516-
#: src/FolderManager/ProjectFolderItem.vala:320
516+
#: src/FolderManager/ProjectFolderItem.vala:318
517517
msgid "Local"
518518
msgstr ""
519519

520-
#: src/FolderManager/ProjectFolderItem.vala:337
520+
#: src/FolderManager/ProjectFolderItem.vala:335
521521
msgid "Remote"
522522
msgstr ""
523523

524-
#: src/FolderManager/ProjectFolderItem.vala:352
524+
#: src/FolderManager/ProjectFolderItem.vala:350
525525
msgid "New Branch…"
526526
msgstr ""
527527

528-
#: src/FolderManager/ProjectFolderItem.vala:377
528+
#: src/FolderManager/ProjectFolderItem.vala:375
529529
msgid "Branch"
530530
msgstr ""
531531

532-
#: src/FolderManager/ProjectFolderItem.vala:433
532+
#: src/FolderManager/ProjectFolderItem.vala:431
533533
msgid "Modified"
534534
msgstr ""
535535

536-
#: src/FolderManager/ProjectFolderItem.vala:471
536+
#: src/FolderManager/ProjectFolderItem.vala:469
537537
#, c-format
538538
msgid "Error while creating new branch: “%s”"
539539
msgstr ""
@@ -927,10 +927,22 @@ msgstr ""
927927
msgid "Follow System Style"
928928
msgstr ""
929929

930-
#: src/Widgets/HeaderBar.vala:240
930+
#: src/Widgets/HeaderBar.vala:239
931931
msgid "Menu"
932932
msgstr ""
933933

934+
#: src/Widgets/HeaderBar.vala:392
935+
msgid "Light"
936+
msgstr ""
937+
938+
#: src/Widgets/HeaderBar.vala:395
939+
msgid "Dark"
940+
msgstr ""
941+
942+
#: src/Widgets/HeaderBar.vala:398
943+
msgid "Contrast"
944+
msgstr ""
945+
934946
#: src/Widgets/Sidebar.vala:52
935947
msgid "Cloning complete"
936948
msgstr ""
@@ -1016,23 +1028,23 @@ msgstr ""
10161028
msgid "no results"
10171029
msgstr ""
10181030

1019-
#: src/Widgets/SourceView.vala:584
1020-
msgid "Sort Selected Lines"
1031+
#: src/Widgets/SourceView.vala:581
1032+
msgid "Sort Lines"
10211033
msgstr ""
10221034

1023-
#: src/Widgets/SourceView.vala:595
1024-
msgid "Mark Current Line"
1035+
#: src/Widgets/SourceView.vala:585
1036+
msgid "Mark Line"
10251037
msgstr ""
10261038

1027-
#: src/Widgets/SourceView.vala:606
1028-
msgid "Goto Previous Edit Mark"
1039+
#: src/Widgets/SourceView.vala:589
1040+
msgid "Previous Mark"
10291041
msgstr ""
10301042

1031-
#: src/Widgets/SourceView.vala:617
1032-
msgid "Goto Next Edit Mark"
1043+
#: src/Widgets/SourceView.vala:593
1044+
msgid "Next Mark"
10331045
msgstr ""
10341046

1035-
#: src/Widgets/SourceView.vala:636
1047+
#: src/Widgets/SourceView.vala:603
10361048
msgid "Toggle Comment"
10371049
msgstr ""
10381050

0 commit comments

Comments
 (0)