Skip to content

Commit

Permalink
Remove usage of old appsys functions (#2233)
Browse files Browse the repository at this point in the history 
We want to remove these functions going forward as they are not needed.
  • Loading branch information
@clefebvre
clefebvre committed Jan 22, 2019
1 parent db508ea commit 99eaa4e
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 102 deletions.
140 changes: 69 additions & 71 deletions CinnVIIStarkMenu@NikoKrause/files/CinnVIIStarkMenu@NikoKrause/3.4/applet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3592,94 +3592,92 @@ MyApplet.prototype = {
this.categoriesBox.add_actor(this._allAppsCategoryButton.actor);
this._categoryButtons.push(this._allAppsCategoryButton);

let trees = [appsys.get_tree()];

for (var i in trees) {
let tree = trees[i];
let root = tree.get_root_directory();
let dirs = [];
let iter = root.iter();
let nextType;

while ((nextType = iter.next()) != CMenu.TreeItemType.INVALID) {
if (nextType == CMenu.TreeItemType.DIRECTORY) {
dirs.push(iter.get_directory());
}
let tree = new CMenu.Tree({ menu_basename: "cinnamon-applications.menu" });
tree.load_sync();
let root = tree.get_root_directory();
let dirs = [];
let iter = root.iter();
let nextType;

while ((nextType = iter.next()) != CMenu.TreeItemType.INVALID) {
if (nextType == CMenu.TreeItemType.DIRECTORY) {
dirs.push(iter.get_directory());
}
}

let prefCats = ["administration", "preferences"];
let prefCats = ["administration", "preferences"];

let sortDirs = function(a, b) {
let menuIdA = a.get_menu_id().toLowerCase();
let menuIdB = b.get_menu_id().toLowerCase();
let sortDirs = function(a, b) {
let menuIdA = a.get_menu_id().toLowerCase();
let menuIdB = b.get_menu_id().toLowerCase();

let prefIdA = prefCats.indexOf(menuIdA);
let prefIdB = prefCats.indexOf(menuIdB);
let prefIdA = prefCats.indexOf(menuIdA);
let prefIdB = prefCats.indexOf(menuIdB);

if (prefIdA < 0 && prefIdB >= 0) {
return -1;
}
if (prefIdA >= 0 && prefIdB < 0) {
return 1;
}
if (prefIdA < 0 && prefIdB >= 0) {
return -1;
}
if (prefIdA >= 0 && prefIdB < 0) {
return 1;
}

let nameA = a.get_name().toLowerCase();
let nameB = b.get_name().toLowerCase();
let nameA = a.get_name().toLowerCase();
let nameB = b.get_name().toLowerCase();

if (nameA > nameB) {
return 1;
}
if (nameA < nameB) {
return -1;
}
return 0;
};
if (nameA > nameB) {
return 1;
}
if (nameA < nameB) {
return -1;
}
return 0;
};

dirs = dirs.sort(sortDirs);
dirs = dirs.sort(sortDirs);

let handleEnterEvent = (categoryButton, dir) => {
this._addEnterEvent(categoryButton, () => {
if (!this.searchActive) {
categoryButton.isHovered = true;
let handleEnterEvent = (categoryButton, dir) => {
this._addEnterEvent(categoryButton, () => {
if (!this.searchActive) {
categoryButton.isHovered = true;

this._clearPrevCatSelection(categoryButton.actor);
categoryButton.actor.style_class = "menu-category-button-selected";
this._select_category(dir.get_menu_id());
this._clearPrevCatSelection(categoryButton.actor);
categoryButton.actor.style_class = "menu-category-button-selected";
this._select_category(dir.get_menu_id());

this.makeVectorBox(categoryButton.actor);
}
});
};
this.makeVectorBox(categoryButton.actor);
}
});
};

let handleLeaveEvent = (categoryButton, dir) => {
categoryButton.actor.connect('leave-event', () => {
if (this._previousTreeSelectedActor === null) {
let handleLeaveEvent = (categoryButton, dir) => {
categoryButton.actor.connect('leave-event', () => {
if (this._previousTreeSelectedActor === null) {
this._previousTreeSelectedActor = categoryButton.actor;
} else {
let prevIdx = this.catBoxIter.getVisibleIndex(this._previousTreeSelectedActor);
let nextIdx = this.catBoxIter.getVisibleIndex(categoryButton.actor);
if (Math.abs(prevIdx - nextIdx) <= 1) {
this._previousTreeSelectedActor = categoryButton.actor;
} else {
let prevIdx = this.catBoxIter.getVisibleIndex(this._previousTreeSelectedActor);
let nextIdx = this.catBoxIter.getVisibleIndex(categoryButton.actor);
if (Math.abs(prevIdx - nextIdx) <= 1) {
this._previousTreeSelectedActor = categoryButton.actor;
}
}
categoryButton.isHovered = false;
});
};
}
categoryButton.isHovered = false;
});
};

for (let i = 0; i < dirs.length; i++) {
let dir = dirs[i];
if (dir.get_is_nodisplay())
continue;
if (this._loadCategory(dir)) {
let categoryButton = new CategoryButton(dir, this.showCategoryIcons);
handleEnterEvent(categoryButton, dir);
handleLeaveEvent(categoryButton, dir);
for (let i = 0; i < dirs.length; i++) {
let dir = dirs[i];
if (dir.get_is_nodisplay())
continue;
if (this._loadCategory(dir)) {
let categoryButton = new CategoryButton(dir, this.showCategoryIcons);
handleEnterEvent(categoryButton, dir);
handleLeaveEvent(categoryButton, dir);

this._categoryButtons.push(categoryButton);
this.categoriesBox.add_actor(categoryButton.actor);
}
this._categoryButtons.push(categoryButton);
this.categoriesBox.add_actor(categoryButton.actor);
}
}

// Sort apps and add to applicationsBox
this._applicationsButtons.sort(function(a, b) {
a = Util.latinise(a.app.get_name().toLowerCase());
Expand Down Expand Up @@ -3748,7 +3746,7 @@ MyApplet.prototype = {
var entry = iter.get_entry();
if (!entry.get_app_info().get_nodisplay()) {
has_entries = true;
var app = appsys.lookup_app_by_tree_entry(entry);
var app = appsys.lookup_app(entry.get_desktop_file_id());
var app_key = app.get_id();
if (app_key == null) {
app_key = app.get_name() + ":" +
Expand Down
56 changes: 27 additions & 29 deletions Cinnamenu@json/files/Cinnamenu@json/4.0/applet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1014,37 +1014,35 @@ class CinnamenuApplet extends TextIconApplet {
buttons = [new CategoryListButton(this.state, 'all', _('All Applications'), 'computer')];
}

let trees = [this.appSystem.get_tree()];
for (let i = 0, len = trees.length; i < len; i++) {
let tree = trees[i];
let root = tree.get_root_directory();
let dirs = [];
let iter = root.iter();
let nextType;
while ((nextType = iter.next()) !== CMenu.TreeItemType.INVALID) {
if (nextType === CMenu.TreeItemType.DIRECTORY) {
dirs.push(iter.get_directory());
}
let tree = new CMenu.Tree({ menu_basename: "cinnamon-applications.menu" });
tree.load_sync();
let root = tree.get_root_directory();
let dirs = [];
let iter = root.iter();
let nextType;
while ((nextType = iter.next()) !== CMenu.TreeItemType.INVALID) {
if (nextType === CMenu.TreeItemType.DIRECTORY) {
dirs.push(iter.get_directory());
}
dirs = sortDirs(dirs)
for (let z = 0, len = dirs.length; z < len; z++) {
let dir = dirs[z];
if (dir.get_is_nodisplay()) {
continue;
}
let dirId = dir.get_menu_id();
this.applicationsByCategory[dirId] = [];
this.loadAppCategories(dir, null, dirId);
if (this.applicationsByCategory[dirId].length > 0) {
if (isReRender) {
let button = find(this.categoryButtons, button => button.id === dirId);
if (!button) {
continue;
}
buttons.push(button);
} else {
buttons.push(new CategoryListButton(this.state, dir, dirId));
}
dirs = sortDirs(dirs)
for (let z = 0, len = dirs.length; z < len; z++) {
let dir = dirs[z];
if (dir.get_is_nodisplay()) {
continue;
}
let dirId = dir.get_menu_id();
this.applicationsByCategory[dirId] = [];
this.loadAppCategories(dir, null, dirId);
if (this.applicationsByCategory[dirId].length > 0) {
if (isReRender) {
let button = find(this.categoryButtons, button => button.id === dirId);
if (!button) {
continue;
}
buttons.push(button);
} else {
buttons.push(new CategoryListButton(this.state, dir, dirId));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions MessagingMenuV3@blub/files/MessagingMenuV3@blub/applet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ MyApplet.prototype = {
let listedDesktopFiles = new Array();
for (let y = 0; y < allApps.length; y++) {
let app = allApps[y];
let entry = app.get_tree_entry();
let path = entry.get_desktop_file_path();
let info = app.get_app_info();
let path = info.get_filename();
//Get Application Desktop Files
for (var p = 0; p < compatible_Apps.length; p++) {
let desktopFile = compatible_Apps[p] + ".desktop";
Expand Down

0 comments on commit 99eaa4e

Please sign in to comment.