Skip to content

Commit 81b8bf5

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents 35cbe57 + f294b6d commit 81b8bf5

File tree

58 files changed

+454
-306
lines changed

Some content is hidden

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

58 files changed

+454
-306
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ temp/
2323
system/cpp-src/mkalteriso/CMakeLists.txt.user
2424
menuconfig-script/kernel_choice_*
2525
/custom.conf
26+
/out/
27+
out

build.sh

Lines changed: 93 additions & 73 deletions
Large diffs are not rendered by default.

channels/cinnamon/airootfs.any/etc/skel/.cinnamon/configs/[email protected]/0.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"overlay-key",
3939
"activate-on-hover",
4040
"hover-delay",
41+
"force-show-panel",
4142
"enable-animation"
4243
]
4344
},
@@ -87,7 +88,7 @@
8788
"default_icon": "cinnamon-symbolic",
8889
"dependency": "menu-custom",
8990
"indent": true,
90-
"value": "alter"
91+
"value": "/usr/share/icons/hicolor/128x128/apps/alter.png"
9192
},
9293
"menu-icon-size": {
9394
"type": "spinbutton",
@@ -99,7 +100,7 @@
99100
"description": "Icon size",
100101
"dependency": "menu-custom",
101102
"indent": true,
102-
"value": 29.0
103+
"value": 29
103104
},
104105
"menu-label": {
105106
"type": "entry",
@@ -179,6 +180,13 @@
179180
"indent": true,
180181
"value": 32
181182
},
183+
"show-favorites": {
184+
"type": "switch",
185+
"default": true,
186+
"description": "Show favorites",
187+
"tooltip": "Choose whether or not to show favorite files in the menu.",
188+
"value": true
189+
},
182190
"show-places": {
183191
"type": "switch",
184192
"default": true,
@@ -207,6 +215,13 @@
207215
"tooltip": "Allows path entry in the menu search box.",
208216
"value": false
209217
},
218+
"force-show-panel": {
219+
"type": "switch",
220+
"default": true,
221+
"description": "Force the panel to be visible when opening the menu",
222+
"tooltip": "Opening the menu will also show the main panel (which may be auto-hidden).",
223+
"value": true
224+
},
210225
"activate-on-hover": {
211226
"type": "switch",
212227
"default": false,
@@ -239,5 +254,5 @@
239254
"callback": "_launch_editor",
240255
"tooltip": "Press this button to customize your menu entries."
241256
},
242-
"__md5__": "9fef899d7c11697066b5f3c4d8479daf"
243-
}
257+
"__md5__": "c4b27da93411965126569249b61793d7"
258+
}

channels/cinnamon/config.any

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ usershell="/bin/zsh"
1919
# An array of module directory names to include.
2020
# This setting cannot be changed by an argument.
2121
modules=(
22-
"share-extra"
23-
"lightdm"
24-
"qtongtk"
2522
"base"
2623
"share"
24+
"share-extra"
2725
"zsh-powerline"
26+
"lightdm"
27+
"qtongtk"
2828
)

channels/gnome/config.any

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ noaur=false
2222
# An array of module directory names to include.
2323
# This setting cannot be changed by an argument.
2424
modules=(
25-
"share-extra"
26-
"qtongtk"
27-
"gdm"
2825
"base"
2926
"share"
27+
"share-extra"
3028
"zsh-powerline"
29+
"gdm"
30+
"qtongtk"
3131
)

channels/i3/config.any

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ usershell="/bin/zsh"
1919
# An array of module directory names to include.
2020
# This setting cannot be changed by an argument.
2121
modules=(
22-
"share-extra"
23-
"lightdm"
24-
"qtongtk"
2522
"base"
2623
"share"
24+
"share-extra"
2725
"zsh-powerline"
26+
"lightdm"
27+
"qtongtk"
2828
)

channels/lxde/config.any

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ usershell="/bin/zsh"
1919
# An array of module directory names to include.
2020
# This setting cannot be changed by an argument.
2121
modules=(
22-
"share-extra"
23-
"lightdm"
24-
"qtongtk"
2522
"base"
2623
"share"
24+
"share-extra"
2725
"zsh-powerline"
26+
"lightdm"
27+
"qtongtk"
2828
)

channels/lxde/packages.i686/lxde.i686

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ papirus-icon-theme
3737

3838
#-- wallpaper --#
3939
alterlinux-wallpapers
40+
41+
42+
#-- To run fascode-live-tools on lxde session --#
43+
python-pyxdg

channels/lxde/packages.x86_64/lang/ja.x86_64

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,3 @@ fcitx
1919
fcitx-configtool
2020
fcitx-mozc
2121
fcitx-qt5
22-
23-
# other
24-
man-pages-ja

channels/lxde/packages.x86_64/lxde.x86_64

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ papirus-icon-theme
3737

3838
#-- wallpaper --#
3939
alterlinux-wallpapers
40+
41+
42+
#-- To run fascode-live-tools on lxde session --#
43+
python-pyxdg

0 commit comments

Comments
 (0)