Skip to content

Simplify cinnamon-menu-editor #13362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredcw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify cinnamon-menu-editor #13362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 22 additions & 36 deletions files/etc/xdg/menus/cinnamon-applications.menu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">

<!-- Category selection logic in this file should be kept in sync with same in cinnamon-desktop-editor.py -->
<Menu>

<Name>Applications</Name>
Expand All @@ -20,10 +21,10 @@
<Include>
<And>
<Category>Utility</Category>
<!-- Accessibility spec must have either the Utility or Settings
category, and we display an accessibility submenu already for
the ones that do not have Settings, so don't display accessibility
applications here -->
<!-- Accessibility spec must have either the Utility or Settings
category, and we display an accessibility submenu already for
the ones that do not have Settings, so don't display accessibility
applications here -->
<Not><Category>Accessibility</Category></Not>
<Not><Category>System</Category></Not>
</And>
Expand Down Expand Up @@ -129,12 +130,6 @@
</Include>
</Menu>

<!-- System Tools-->
<Menu>
<Name>System</Name>
<Directory>cinnamon-system-tools.directory</Directory>
</Menu> <!-- End System Tools -->

<!-- Other -->
<Menu>
<Name>Other</Name>
Expand Down Expand Up @@ -176,36 +171,27 @@
<Name>Administration</Name>
<Directory>cinnamon-settings-system.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Category>System</Category>
</And>
</Include>
<Include>
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
</And>
<Category>System</Category>
</Include>
</Menu> <!-- End System Settings -->

<Layout>
<Merge type="menus"/>
<Menuname>Accessories</Menuname>
<Menuname>Education</Menuname>
<Menuname>Games</Menuname>
<Menuname>Graphics</Menuname>
<Menuname>Internet</Menuname>
<Menuname>Office</Menuname>
<Menuname>Other</Menuname>
<Menuname>Development</Menuname>
<Menuname>Multimedia</Menuname>
<Menuname>System</Menuname>
<Menuname>Universal Access</Menuname>
<Menuname>wine-wine</Menuname>
<Menuname>Preferences</Menuname>
<Menuname>Administration</Menuname>
<Merge type="files"/>
<Merge type="menus"/>
<Menuname>Accessories</Menuname>
<Menuname>Education</Menuname>
<Menuname>Games</Menuname>
<Menuname>Graphics</Menuname>
<Menuname>Internet</Menuname>
<Menuname>Office</Menuname>
<Menuname>Other</Menuname>
<Menuname>Development</Menuname>
<Menuname>Science</Menuname>
<Menuname>Multimedia</Menuname>
<Menuname>Universal Access</Menuname>
<Menuname>wine-wine</Menuname>
<Menuname>Preferences</Menuname>
<Menuname>Administration</Menuname>
<Merge type="files"/>
</Layout>

</Menu> <!-- End Applications -->
9 changes: 1 addition & 8 deletions files/usr/bin/cinnamon-menu-editor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@ from cme import MainWindow


def main():
try:
from MenuEditor import config
datadir = config.pkgdatadir
version = config.VERSION
except Exception:
datadir = '.'
version = '0.9'
app = MainWindow.MainWindow(datadir, version)
app = MainWindow.MainWindow()
app.run()


Expand Down
Loading
Loading