Skip to content

Commit a985df6

Browse files
authored
Merge branch 'master' into jeremypw/terminal-pane/save-state
2 parents b505e03 + 5fc9112 commit a985df6

File tree

622 files changed

+37000
-27835
lines changed

Some content is hidden

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

622 files changed

+37000
-27835
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@v4
21+
- uses: actions/checkout@v5
2222
- name: Install Dependencies
2323
run: |
2424
apt update
@@ -50,7 +50,7 @@ jobs:
5050

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

5555
- name: Build
5656
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.5
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v5
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@v4
12+
uses: actions/checkout@v5
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@v4
12+
- uses: actions/checkout@v5
1313
- uses: elementary/actions/release@main
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

data/code.metainfo.xml.in

Lines changed: 17 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.0/data/screenshot.png</image>
32+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot.png</image>
3333
</screenshot>
3434
<screenshot>
35-
<image>https://raw.githubusercontent.com/elementary/code/8.1.0/data/screenshot-dark.png</image>
35+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot-dark.png</image>
3636
</screenshot>
3737
</screenshots>
3838

@@ -68,6 +68,21 @@
6868
<update_contact>contact_AT_elementary.io</update_contact>
6969

7070
<releases>
71+
<release version="8.1.1" date="2025-09-06" urgency="medium">
72+
<description>
73+
<p>Minor updates:</p>
74+
<ul>
75+
<li>The terminal pane is now synchronized with the Terminal app foreground, background and palette settings</li>
76+
<li>The terminal pane is now synchronized with GNOME font and cursor blink settings</li>
77+
<li>Updated translations</li>
78+
</ul>
79+
</description>
80+
<issues>
81+
<issue url="https://github.com/elementary/code/issues/1586">Relies on external Terminal settings keys</issue>
82+
<issue url="https://github.com/elementary/code/issues/457">Exiting process running in terminal leaves terminal useless</issue>
83+
<issue url="https://github.com/elementary/code/issues/276">Listen for changes to Terminal color scheme</issue>
84+
</issues>
85+
</release>
7186
<release version="8.1.0" date="2025-08-01" urgency="medium">
7287
<description>
7388
<p>Improvements:</p>

meson.build

Lines changed: 35 additions & 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.0'
5+
version: '8.1.1'
66
)
77

88
add_project_arguments([
@@ -73,6 +73,40 @@ if get_option('development') and git.found ()
7373
branch = output.stdout().strip()
7474
endif
7575

76+
# Profiler linking code taken from https://github.com/RidgeRun/gst-inference/blob/master/meson.build
77+
# with some amendments
78+
# 'libprofiler' and 'libtcmalloc' are provided by installing (e.g.) 'google-perftools' and 'libgoogle-pertools-dev'
79+
# Profiling is not active unless either the correct environment variables are set at runtime
80+
# or the profiling is switched on/off in the code using the CPU_PROFILING and HEAP_PROFILING conditional compilation flags
81+
# with the commands Profiler.start (<path-to-profile-output>) and Profiler.stop () and the corresponding HeapProfiler functions
82+
# It is advisable not to run cpu profiling at the same time as heap profiling
83+
# If meson options are changed then rebuild with 'cd .. && sudo rm -R ./build && build'
84+
# See https://github.com/gperftools/gperftools/blob/master/docs/cpuprofile.adoc
85+
# and https://github.com/gperftools/gperftools/blob/master/docs/heapprofile.adoc
86+
if get_option('cpu-profiling-enabled')
87+
profiler_dep = dependency ('libprofiler')
88+
if(profiler_dep.found())
89+
message('CPU profiling enabled: Building with profiling support.')
90+
add_global_link_arguments ('-lprofiler', language: 'c')
91+
add_project_arguments ('--define=PROFILING', language: 'vala')
92+
dependencies += profiler_dep
93+
else
94+
message('MESON_FAIL: CPU profiling requested but libprofiler (gperftools) not found.')
95+
endif
96+
endif
97+
if get_option('heap-profiling-enabled')
98+
heap_profiler_dep = dependency ('libtcmalloc')
99+
if(heap_profiler_dep.found())
100+
message('Heap profiling enabled: Building with heap profiling support.')
101+
add_global_link_arguments ('-ltcmalloc', language: 'c')
102+
add_project_arguments ('--define=HEAP_PROFILING', language: 'vala')
103+
dependencies += heap_profiler_dep
104+
else
105+
message('MESON_FAIL: Heap profiling requested but libtcmalloc (gperftools) not found.')
106+
endif
107+
endif
108+
109+
76110
subdir('data')
77111
subdir('src')
78112
if get_option('plugins')

meson_options.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
option('plugins', type : 'boolean', value : true)
22
option('have_pkexec', type : 'boolean', value : true, description : 'Allow launching with pkexec. Should not be used in FlatPak')
33
option('development', type : 'boolean', value : false, description : 'Build is a development branch')
4+
option('cpu-profiling-enabled', type : 'boolean', value : false, description: 'Enable cpu profiling')
5+
option('heap-profiling-enabled', type : 'boolean', value : false, description: 'Enable heap profiling')

po/LINGUAS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,5 @@ aa
198198
ab
199199
gn
200200
an
201+
zh_HANT
202+
zh_HANS

po/aa.po

Lines changed: 57 additions & 46 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-07-23 15:37+0000\n"
5+
"POT-Creation-Date: 2025-10-16 17:18+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 <LL@li.org>\n"
@@ -103,7 +103,7 @@ msgstr ""
103103

104104
#: src/MainWindow.vala:987 src/Dialogs/CloneRepositoryDialog.vala:58
105105
#: src/Dialogs/CloneRepositoryDialog.vala:97
106-
#: src/Dialogs/GlobalSearchDialog.vala:109 src/Dialogs/NewBranchDialog.vala:42
106+
#: src/Dialogs/GlobalSearchDialog.vala:86 src/Dialogs/NewBranchDialog.vala:42
107107
#: src/Services/Document.vala:510 src/Services/Document.vala:680
108108
#: plugins/pastebin/pastebin_dialog.vala:327
109109
#: plugins/pastebin/pastebin_dialog.vala:378
@@ -118,22 +118,21 @@ msgstr ""
118118
msgid "_Cancel"
119119
msgstr ""
120120

121-
#: src/MainWindow.vala:1075
122-
#, c-format
123-
msgid "Repository %s successfully cloned"
121+
#: src/MainWindow.vala:1077
122+
msgid "Cloning completed"
124123
msgstr ""
125124

126-
#: src/MainWindow.vala:1076
125+
#: src/MainWindow.vala:1078
127126
#, c-format
128-
msgid "Local repository working directory is %s"
127+
msgid "Clone successfully created in %s"
129128
msgstr ""
130129

131-
#: src/MainWindow.vala:1087
130+
#: src/MainWindow.vala:1084
132131
#, c-format
133132
msgid "Unable to clone %s"
134133
msgstr ""
135134

136-
#: src/MainWindow.vala:1094
135+
#: src/MainWindow.vala:1091
137136
msgid "Retry"
138137
msgstr ""
139138

@@ -186,24 +185,32 @@ msgstr ""
186185
msgid "Cloning in progress"
187186
msgstr ""
188187

189-
#: src/Dialogs/GlobalSearchDialog.vala:69
190-
#, c-format
191-
msgid "Search for text in “%s”"
188+
#: src/Dialogs/GlobalSearchDialog.vala:62
189+
msgid "The search term will be treated as a regex expression"
192190
msgstr ""
193191

194-
#: src/Dialogs/GlobalSearchDialog.vala:70
195-
msgid "The search term must be at least 3 characters long."
192+
#: src/Dialogs/GlobalSearchDialog.vala:64
193+
msgid "Search will be case sensitive"
196194
msgstr ""
197195

198-
#: src/Dialogs/GlobalSearchDialog.vala:83
199-
msgid "Case sensitive:"
196+
#: src/Dialogs/GlobalSearchDialog.vala:64
197+
msgid "Search will be case insensitive"
200198
msgstr ""
201199

202-
#: src/Dialogs/GlobalSearchDialog.vala:92
203-
msgid "Use regular expressions:"
200+
#: src/Dialogs/GlobalSearchDialog.vala:65
201+
msgid "Search will match only whole words"
204202
msgstr ""
205203

206-
#: src/Dialogs/GlobalSearchDialog.vala:111
204+
#: src/Dialogs/GlobalSearchDialog.vala:68
205+
#, c-format
206+
msgid "Search for text in “%s”"
207+
msgstr ""
208+
209+
#: src/Dialogs/GlobalSearchDialog.vala:69
210+
msgid "The search term must be at least 3 characters long."
211+
msgstr ""
212+
213+
#: src/Dialogs/GlobalSearchDialog.vala:88
207214
msgid "Search"
208215
msgstr ""
209216

@@ -776,24 +783,24 @@ msgstr ""
776783
msgid "Deselect All"
777784
msgstr ""
778785

779-
#: src/Widgets/ChooseProjectButton.vala:20
786+
#: src/Widgets/ChooseProjectButton.vala:22
780787
msgid "No Project Selected"
781788
msgstr ""
782789

783-
#: src/Widgets/ChooseProjectButton.vala:21
790+
#: src/Widgets/ChooseProjectButton.vala:23
784791
#, c-format
785792
msgid "Active Git Project: %s"
786793
msgstr ""
787794

788-
#: src/Widgets/ChooseProjectButton.vala:51
795+
#: src/Widgets/ChooseProjectButton.vala:61
789796
msgid "Filter projects"
790797
msgstr ""
791798

792-
#: src/Widgets/ChooseProjectButton.vala:74
799+
#: src/Widgets/ChooseProjectButton.vala:84
793800
msgid "Open Folder…"
794801
msgstr ""
795802

796-
#: src/Widgets/ChooseProjectButton.vala:80
803+
#: src/Widgets/ChooseProjectButton.vala:90
797804
msgid "Clone Git Repository…"
798805
msgstr ""
799806

@@ -920,84 +927,88 @@ msgstr ""
920927
msgid "Menu"
921928
msgstr ""
922929

923-
#: src/Widgets/Sidebar.vala:59
930+
#: src/Widgets/Sidebar.vala:52
931+
msgid "Cloning complete"
932+
msgstr ""
933+
934+
#: src/Widgets/Sidebar.vala:74
924935
msgid "Collapse All"
925936
msgstr ""
926937

927-
#: src/Widgets/Sidebar.vala:62
938+
#: src/Widgets/Sidebar.vala:77
928939
msgid "Alphabetize"
929940
msgstr ""
930941

931-
#: src/Widgets/Sidebar.vala:70
942+
#: src/Widgets/Sidebar.vala:85
932943
msgid "Manage project folders…"
933944
msgstr ""
934945

935-
#: src/Widgets/SearchBar.vala:99
946+
#: src/Widgets/SearchBar.vala:101
936947
msgid "Find"
937948
msgstr ""
938949

939-
#: src/Widgets/SearchBar.vala:102
950+
#: src/Widgets/SearchBar.vala:104
940951
msgid "No Results"
941952
msgstr ""
942953

943-
#: src/Widgets/SearchBar.vala:114
954+
#: src/Widgets/SearchBar.vala:116
944955
msgid "Search next"
945956
msgstr ""
946957

947-
#: src/Widgets/SearchBar.vala:124
958+
#: src/Widgets/SearchBar.vala:126
948959
msgid "Search previous"
949960
msgstr ""
950961

951-
#: src/Widgets/SearchBar.vala:127
962+
#: src/Widgets/SearchBar.vala:129
952963
msgid "Cyclic Search"
953964
msgstr ""
954965

955-
#: src/Widgets/SearchBar.vala:130 plugins/pastebin/pastebin_dialog.vala:467
966+
#: src/Widgets/SearchBar.vala:132 plugins/pastebin/pastebin_dialog.vala:467
956967
msgid "Never"
957968
msgstr ""
958969

959-
#: src/Widgets/SearchBar.vala:131
970+
#: src/Widgets/SearchBar.vala:133
960971
msgid "Mixed Case"
961972
msgstr ""
962973

963-
#: src/Widgets/SearchBar.vala:132
974+
#: src/Widgets/SearchBar.vala:134
964975
msgid "Always"
965976
msgstr ""
966977

967-
#: src/Widgets/SearchBar.vala:135
978+
#: src/Widgets/SearchBar.vala:137
968979
msgid "Case Sensitive"
969980
msgstr ""
970981

971-
#: src/Widgets/SearchBar.vala:142
982+
#: src/Widgets/SearchBar.vala:144
972983
msgid "Use Regular Expressions"
973984
msgstr ""
974985

975-
#: src/Widgets/SearchBar.vala:143
986+
#: src/Widgets/SearchBar.vala:145
976987
msgid "Match Whole Words"
977988
msgstr ""
978989

979-
#: src/Widgets/SearchBar.vala:164
990+
#: src/Widgets/SearchBar.vala:166
980991
msgid "Search Options"
981992
msgstr ""
982993

983-
#: src/Widgets/SearchBar.vala:196
994+
#: src/Widgets/SearchBar.vala:203
984995
msgid "Replace With"
985996
msgstr ""
986997

987-
#: src/Widgets/SearchBar.vala:199
998+
#: src/Widgets/SearchBar.vala:206
988999
msgid "Replace"
9891000
msgstr ""
9901001

991-
#: src/Widgets/SearchBar.vala:202
1002+
#: src/Widgets/SearchBar.vala:209
9921003
msgid "Replace all"
9931004
msgstr ""
9941005

995-
#: src/Widgets/SearchBar.vala:607
1006+
#: src/Widgets/SearchBar.vala:614
9961007
#, c-format
9971008
msgid "%d of %d"
9981009
msgstr ""
9991010

1000-
#: src/Widgets/SearchBar.vala:612
1011+
#: src/Widgets/SearchBar.vala:619
10011012
msgid "no results"
10021013
msgstr ""
10031014

@@ -1021,11 +1032,11 @@ msgstr ""
10211032
msgid "Toggle Comment"
10221033
msgstr ""
10231034

1024-
#: src/Widgets/Terminal.vala:62
1035+
#: src/Widgets/Terminal.vala:140
10251036
msgid "Copy"
10261037
msgstr ""
10271038

1028-
#: src/Widgets/Terminal.vala:63
1039+
#: src/Widgets/Terminal.vala:141
10291040
msgid "Paste"
10301041
msgstr ""
10311042

0 commit comments

Comments
 (0)