Skip to content

Commit 109476c

Browse files
authored
Merge branch 'big' into fix-memory-leak
2 parents 7eaf1a8 + a261d0c commit 109476c

15 files changed

+3606
-3
lines changed

.github/workflows/build-package.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Build Package
2+
3+
on:
4+
workflow_dispatch:
5+
6+
push:
7+
branches: [ "*" ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
File renamed without changes.

gresources/nemo-shell-ui.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
</menu>
7272
<menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
7373
<menuitem name="Show Hide Statusbar" action="Show Hide Statusbar"/>
74+
<menuitem name="Show Hide Terminal" action="Show Hide Terminal"/>
7475
<separator/>
7576
<menuitem name="Show Hide Extra Pane" action="Show Hide Extra Pane"/>
7677
<menuitem name="Edit Location" action="Edit Location"/>

libnemo-private/org.nemo.gschema.xml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,29 @@
5959
<value nick="after-current-tab" value="0"/>
6060
<value nick="end" value="1"/>
6161
</enum>
62-
62+
6363
<enum id="org.nemo.SizePrefixes">
6464
<value value="0" nick="base-10"/>
6565
<value value="1" nick="base-10-full"/>
6666
<value value="2" nick="base-2"/>
6767
<value value="3" nick="base-2-full"/>
6868
</enum>
6969

70+
<enum id="org.nemo.TerminalSyncMode">
71+
<value nick="none" value="0"/>
72+
<value nick="fm-to-term" value="1"/>
73+
<value nick="term-to-fm" value="2"/>
74+
<value nick="both" value="3"/>
75+
</enum>
76+
77+
<enum id="org.nemo.TerminalSshAutoConnectMode">
78+
<value nick="off" value="0"/>
79+
<value nick="sync-both" value="1"/>
80+
<value nick="sync-fm-to-term" value="2"/>
81+
<value nick="sync-term-to-fm" value="3"/>
82+
<value nick="sync-none" value="4"/>
83+
</enum>
84+
7085
<schema id="org.nemo" path="/org/nemo/" gettext-domain="nemo">
7186
<child name="preferences" schema="org.nemo.preferences"/>
7287
<child name="icon-view" schema="org.nemo.icon-view"/>
@@ -629,6 +644,36 @@
629644
<summary>Whether the navigation window should be maximized.</summary>
630645
<description>Whether the navigation window should be maximized by default.</description>
631646
</key>
647+
<key name="local-terminal-sync-mode" enum="org.nemo.TerminalSyncMode">
648+
<default>'both'</default>
649+
<summary>Local terminal folder synchronization mode</summary>
650+
<description>Determines how the embedded terminal synchronizes its current directory with the file manager when navigating local folders. 'none': No synchronization. 'fm-to-term': File manager navigation changes terminal directory. 'term-to-fm': Terminal navigation changes file manager location. 'both': Synchronization works in both directions.</description>
651+
</key>
652+
<key name="ssh-terminal-auto-connect-mode" enum="org.nemo.TerminalSshAutoConnectMode">
653+
<default>'off'</default>
654+
<summary>SSH terminal auto-connection and synchronization mode preference</summary>
655+
<description>Determines behavior when an SFTP location is active. 'off': Do not connect automatically. 'sync-both': Connect and sync both ways. 'sync-fm-to-term': Connect and sync File Manager to Terminal. 'sync-term-to-fm': Connect and sync Terminal to File Manager. 'sync-none': Connect without folder synchronization.</description>
656+
</key>
657+
<key name="terminal-height" type="i">
658+
<default>300</default>
659+
<summary>Terminal panel height</summary>
660+
<description>Height of the terminal panel in pixels.</description>
661+
</key>
662+
<key name="terminal-visible" type="b">
663+
<default>false</default>
664+
<summary>Terminal pane visibility</summary>
665+
<description>Whether the terminal pane should be visible.</description>
666+
</key>
667+
<key name="terminal-color-scheme" type="s">
668+
<default>'system'</default>
669+
<summary>Terminal color scheme</summary>
670+
<description>The color scheme to use for the embedded terminal. Available values: 'system', 'dark', 'light', 'solarized-dark', 'solarized-light', 'matrix', 'one-half-dark', 'one-half-light', 'monokai', 'custom'.</description>
671+
</key>
672+
<key name="terminal-font-size" type="i">
673+
<default>12</default>
674+
<summary>Terminal font size</summary>
675+
<description>The font size to use for the embedded terminal in point units.</description>
676+
</key>
632677
<key name="sidebar-width" type="i">
633678
<default>170</default>
634679
<summary>Width of the side pane</summary>

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ gmodule = dependency('gmodule-no-export-2.0', version: glib_version)
7777
gobject = dependency('gobject-2.0', version: '>=2.0')
7878
go_intr = dependency('gobject-introspection-1.0', version: '>=1.0')
7979
json = dependency('json-glib-1.0', version: '>=1.6')
80+
vte = dependency('vte-2.91', version: '>=0.52.0')
8081

8182
cinnamon= dependency('cinnamon-desktop', version: '>=4.8.0')
8283
gail = dependency('gail-3.0')

pkgbuild/PKGBUILD

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Maintainer: Bruno Pagani <[email protected]>
2+
# Maintainer: BarnabediKartola
3+
# Contributor: Eli Schwartz <[email protected]>
4+
# Contributor: Alexandre Filgueira <[email protected]>
5+
# Contributor: Ner0
6+
7+
pkgname=nemo
8+
pkgver=6.4.5
9+
pkgrel=1
10+
pkgdesc="Cinnamon file manager (Nautilus fork) with biglinux custons"
11+
arch=(x86_64)
12+
url="https://github.com/biglinux/${pkgname}"
13+
license=(GPL)
14+
depends=(cinnamon-desktop dconf gvfs exempi libexif libnotify libxml2
15+
python xapp vte3)
16+
optdepends=('cinnamon-translations: i18n'
17+
'ffmpegthumbnailer: support for video thumbnails'
18+
'catdoc: search helpers support for legacy MS Office files'
19+
'ghostscript: search helpers support for PostScript files'
20+
'libgsf: search helpers support for MS Office files'
21+
'libreoffice: search helpers support for legacy MS Office powerpoint files'
22+
'odt2txt: search helpers support for LibreOffice files'
23+
'poppler: search helpers support for PDF')
24+
makedepends=(meson samurai gobject-introspection intltool libgsf glib2-devel)
25+
# source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
26+
source=("git+${url}.git")
27+
sha512sums=('SKIP')
28+
b2sums=('SKIP')
29+
30+
prepare() {
31+
# cd ${pkgname}-${pkgver}
32+
cd ${pkgname}
33+
# Rename 'Files' app name to avoid having the same as nautilus
34+
sed -i '/^\[Desktop Entry/,/^\[Desktop Action/ s/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
35+
}
36+
37+
build() {
38+
# arch-meson --libexecdir=lib/${pkgname} ${pkgname}-${pkgver} build
39+
arch-meson --libexecdir=lib/${pkgname} ${pkgname} build
40+
samu -C build
41+
}
42+
43+
package() {
44+
DESTDIR="${pkgdir}" samu -C build install
45+
}

src/meson.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ nemoCommon_sources = [
6060
'nemo-script-config-widget.c',
6161
'nemo-self-check-functions.c',
6262
'nemo-statusbar.c',
63+
'nemo-terminal-widget.c',
6364
'nemo-thumbnail-problem-bar.c',
6465
'nemo-toolbar.c',
6566
'nemo-trash-bar.c',
@@ -103,7 +104,7 @@ if enableEmptyView
103104
endif
104105

105106
nemo_deps = [ cinnamon, gail, glib, gtk, math,
106-
egg, nemo_extension, nemo_private, xapp, jemalloc ]
107+
egg, nemo_extension, nemo_private, xapp, vte, jemalloc ]
107108

108109
if exempi_enabled
109110
nemo_deps += exempi

src/nemo-actions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
#define NEMO_ACTION_OPEN_IN_TERMINAL "OpenInTerminal"
150150
#define NEMO_ACTION_FOLLOW_SYMLINK "FollowSymbolicLink"
151151
#define NEMO_ACTION_OPEN_CONTAINING_FOLDER "OpenContainingFolder"
152+
#define NEMO_ACTION_SHOW_HIDE_TERMINAL "Show Hide Terminal"
152153

153154
#define NEMO_ACTION_PLUGIN_MANAGER "NemoPluginManager"
154155

0 commit comments

Comments
 (0)