Skip to content

Commit c2bbfe7

Browse files
committed
Update cinnamon-menu-editor and cinnamon-desktop-editor
cinnamon-menu-editor: Remove item cut/copy/paste from menu editor and add menu category selection to desktop editor instead so that instead of the menu editor adding <Include> and <Exclude> rules to the .menu file when launchers are added to/remove from categories, the desktop editor adds/removes categories to the Categories= field in the .desktop file. Remove code related to separators and menu layout/ordering as these are not used in cinnamon applets. Add "Restore Item" button and remove "Close" button. Handle flatpak apps properly cinnamon-desktop editor: Add menu category selection for launcher editor. Add "Hide (NoDisplay)" toggle for launcher editor and directory editor. Remove unnecessary <Include> and <Exclude> rules from the .menu file added in previous versions of menu-editor when a .desktop file is updated. config.py: delete unused constants cinnamon-applications.menu: simplify logic in "Administration" menu remove unused "System" menu
1 parent 78b92bd commit c2bbfe7

10 files changed

Lines changed: 789 additions & 1134 deletions

File tree

files/etc/xdg/menus/cinnamon-applications.menu

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,6 @@
129129
</Include>
130130
</Menu>
131131

132-
<!-- System Tools-->
133-
<Menu>
134-
<Name>System</Name>
135-
<Directory>cinnamon-system-tools.directory</Directory>
136-
</Menu> <!-- End System Tools -->
137-
138132
<!-- Other -->
139133
<Menu>
140134
<Name>Other</Name>
@@ -176,16 +170,7 @@
176170
<Name>Administration</Name>
177171
<Directory>cinnamon-settings-system.directory</Directory>
178172
<Include>
179-
<And>
180-
<Category>Settings</Category>
181-
<Category>System</Category>
182-
</And>
183-
</Include>
184-
<Include>
185-
<And>
186-
<Category>System</Category>
187-
<Not><Category>Settings</Category></Not>
188-
</And>
173+
<Category>System</Category>
189174
</Include>
190175
</Menu> <!-- End System Settings -->
191176

@@ -199,8 +184,8 @@
199184
<Menuname>Office</Menuname>
200185
<Menuname>Other</Menuname>
201186
<Menuname>Development</Menuname>
187+
<Menuname>Science</Menuname>
202188
<Menuname>Multimedia</Menuname>
203-
<Menuname>System</Menuname>
204189
<Menuname>Universal Access</Menuname>
205190
<Menuname>wine-wine</Menuname>
206191
<Menuname>Preferences</Menuname>

files/usr/bin/cinnamon-menu-editor

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@ from cme import MainWindow
1313

1414

1515
def main():
16-
try:
17-
from MenuEditor import config
18-
datadir = config.pkgdatadir
19-
version = config.VERSION
20-
except Exception:
21-
datadir = '.'
22-
version = '0.9'
23-
app = MainWindow.MainWindow(datadir, version)
16+
app = MainWindow.MainWindow()
2417
app.run()
2518

2619

0 commit comments

Comments
 (0)