Skip to content

Commit bc92def

Browse files
jeremypwjeremypw
authored
Merge branch 'master' into jeremypw/keep-projects-sorted
2 parents 6cfef40 + d065ae9 commit bc92def

File tree

630 files changed

+15179
-9648
lines changed

Some content is hidden

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

630 files changed

+15179
-9648
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/code.metainfo.xml.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
<screenshots>
3131
<screenshot type="default">
32-
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot.png</image>
32+
<image>https://raw.githubusercontent.com/elementary/code/8.1.2/data/screenshot.png</image>
3333
</screenshot>
3434
<screenshot>
35-
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot-dark.png</image>
35+
<image>https://raw.githubusercontent.com/elementary/code/8.1.2/data/screenshot-dark.png</image>
3636
</screenshot>
3737
</screenshots>
3838

‎data/io.elementary.code.gschema.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@
111111
<summary>Highlight Matching Brackets</summary>
112112
<description>Whether Code should highlight matching brackets.</description>
113113
</key>
114+
<key name="syntax-highlighting" type="b">
115+
<default>true</default>
116+
<summary>Highlight source code syntax</summary>
117+
<description>Whether Code should apply syntax highlighting to documents.</description>
118+
</key>
114119
<key name="draw-spaces" enum="io.elementary.code.draw-spaces-states">
115120
<default>"For Selection"</default>
116121
<summary>Draw spaces and tabs with symbols</summary>

‎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>

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(
22
'io.elementary.code',
33
'vala', 'c',
44
meson_version: '>= 0.58.0',
5-
version: '8.1.1'
5+
version: '8.1.2'
66
)
77

88
add_project_arguments([

‎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

0 commit comments

Comments
 (0)