From 98860733bbb94b9b9fc6df550bb98c6d37e6a95e Mon Sep 17 00:00:00 2001 From: Marina Zhurakhinskaya Date: Tue, 9 Dec 2008 22:10:43 +0000 Subject: [PATCH] Convert some variable and file names to lowerCamelCase. Remove unused variables in AppDisplay::_filterAdd(). svn path=/trunk/; revision=123 --- js/ui/{appdisplay.js => appDisplay.js} | 110 +++++++++---------- js/ui/main.js | 20 ++-- js/ui/overlay.js | 22 ++-- js/ui/{run_dialog.js => runDialog.js} | 0 js/ui/{windowmanager.js => windowManager.js} | 0 5 files changed, 75 insertions(+), 77 deletions(-) rename js/ui/{appdisplay.js => appDisplay.js} (77%) rename js/ui/{run_dialog.js => runDialog.js} (100%) rename js/ui/{windowmanager.js => windowManager.js} (100%) diff --git a/js/ui/appdisplay.js b/js/ui/appDisplay.js similarity index 77% rename from js/ui/appdisplay.js rename to js/ui/appDisplay.js index 612f0a07e..a9ff0200c 100644 --- a/js/ui/appdisplay.js +++ b/js/ui/appDisplay.js @@ -54,13 +54,13 @@ function AppDisplayItem(node, width) { } AppDisplayItem.prototype = { - _init: function(appinfo, width) { + _init: function(appInfo, width) { let me = this; - this._appinfo = appinfo; + this._appInfo = appInfo; - let name = appinfo.get_name(); + let name = appInfo.get_name(); - let icontheme = Gtk.IconTheme.get_default(); + let iconTheme = Gtk.IconTheme.get_default(); this._group = new Clutter.Group({reactive: true, width: width, @@ -76,10 +76,10 @@ AppDisplayItem.prototype = { this._group.add_actor(this._bg); this._icon = new Clutter.Texture({ width: 48, height: 48, x: 0, y: 0 }); - let gicon = appinfo.get_icon(); + let gicon = appInfo.get_icon(); let path = null; if (gicon != null) { - let iconinfo = icontheme.lookup_by_gicon(gicon, 48, Gtk.IconLookupFlags.NO_SVG); + let iconinfo = iconTheme.lookup_by_gicon(gicon, 48, Gtk.IconLookupFlags.NO_SVG); if (iconinfo) path = iconinfo.get_filename(); } @@ -88,7 +88,7 @@ AppDisplayItem.prototype = { this._icon.set_from_file(path); this._group.add_actor(this._icon); - let comment = appinfo.get_description(); + let comment = appInfo.get_description(); let text_width = width - (me._icon.width + 4); this._name = new Clutter.Label({ color: APPDISPLAY_NAME_COLOR, font_name: "Sans 14px", @@ -109,10 +109,10 @@ AppDisplayItem.prototype = { this.actor = this._group; }, launch: function() { - this._appinfo.launch([], null); + this._appInfo.launch([], null); }, - appinfo: function () { - return this._appinfo; + appInfo: function () { + return this._appInfo; }, markSelected: function(isSelected) { let color; @@ -137,16 +137,16 @@ AppDisplay.prototype = { this._search = ''; this._width = width; this._height = height; - this._appmonitor = new Shell.AppMonitor(); + this._appMonitor = new Shell.AppMonitor(); this._appsStale = true; - this._appmonitor.connect('changed', function(mon) { + this._appMonitor.connect('changed', function(mon) { me._appsStale = true; }); this._grid = new Tidy.Grid({width: width, height: height}); - this._appset = {}; // Map - this._displayed = {}; // Map + this._appSet = {}; // Map + this._displayed = {}; // Map this._selectedIndex = -1; - this._max_items = this._height / (APPDISPLAY_HEIGHT + APPDISPLAY_PADDING); + this._maxItems = this._height / (APPDISPLAY_HEIGHT + APPDISPLAY_PADDING); this.actor = this._grid; }, @@ -157,38 +157,38 @@ AppDisplay.prototype = { return; for (id in this._displayed) this._displayed[id].destroy(); - this._appset = {}; + this._appSet = {}; this._displayed = {}; this._selectedIndex = -1; let apps = Gio.app_info_get_all(); for (let i = 0; i < apps.length; i++) { - let appinfo = apps[i]; - let appid = appinfo.get_id(); - this._appset[appid] = appinfo; + let appInfo = apps[i]; + let appId = appInfo.get_id(); + this._appSet[appId] = appInfo; } this._appsStale = false; }, - _removeItem: function(appid) { - let item = this._displayed[appid]; + _removeItem: function(appId) { + let item = this._displayed[appId]; let group = item.actor; group.destroy(); - delete this._displayed[appid]; + delete this._displayed[appId]; }, _removeAll: function() { - for (appid in this._displayed) - this._removeItem(appid); + for (appId in this._displayed) + this._removeItem(appId); }, _setDefaultList: function() { this._removeAll(); let added = 0; - for (let i = 0; i < DEFAULT_APPLICATIONS.length && added < this._max_items; i++) { - let appid = DEFAULT_APPLICATIONS[i]; - let appinfo = this._appset[appid]; - if (appinfo) { - this._filterAdd(appid); + for (let i = 0; i < DEFAULT_APPLICATIONS.length && added < this._maxItems; i++) { + let appId = DEFAULT_APPLICATIONS[i]; + let appInfo = this._appSet[appId]; + if (appInfo) { + this._filterAdd(appId); added += 1; } } @@ -200,52 +200,50 @@ AppDisplay.prototype = { return c; }, - _filterAdd: function(appid) { + _filterAdd: function(appId) { let me = this; - let appinfo = this._appset[appid]; - let name = appinfo.get_name(); - let index = this._getNDisplayed(); + let appInfo = this._appSet[appId]; - let appdisplay = new AppDisplayItem(appinfo, this._width); - appdisplay.connect('activate', function() { - appdisplay.launch(); + let appDisplayItem = new AppDisplayItem(appInfo, this._width); + appDisplayItem.connect('activate', function() { + appDisplayItem.launch(); me.emit('activated'); }); - let group = appdisplay.actor; + let group = appDisplayItem.actor; this._grid.add_actor(group); - this._displayed[appid] = appdisplay; + this._displayed[appId] = appDisplayItem; }, - _filterRemove: function(appid) { + _filterRemove: function(appId) { // In the future, do some sort of fade out or other effect here - let item = this._displayed[appid]; + let item = this._displayed[appId]; this._removeItem(item); }, - _appinfoMatches: function(appinfo, search) { + _appInfoMatches: function(appInfo, search) { if (search == null || search == '') return true; - let name = appinfo.get_name().toLowerCase(); + let name = appInfo.get_name().toLowerCase(); if (name.indexOf(search) >= 0) return true; - let description = appinfo.get_description(); + let description = appInfo.get_description(); if (description) { description = description.toLowerCase(); if (description.indexOf(search) >= 0) return true; } - let exec = appinfo.get_executable().toLowerCase(); + let exec = appInfo.get_executable().toLowerCase(); if (exec.indexOf(search) >= 0) return true; return false; }, - _sortApps: function(appids) { + _sortApps: function(appIds) { let me = this; - return appids.sort(function (a,b) { - let appA = me._appset[a]; - let appB = me._appset[b]; + return appIds.sort(function (a,b) { + let appA = me._appSet[a]; + let appB = me._appSet[b]; return appA.get_name().localeCompare(appB.get_name()); }); }, @@ -253,14 +251,14 @@ AppDisplay.prototype = { _doSearchFilter: function() { this._removeAll(); let matchedApps = []; - for (appid in this._appset) { - if (matchedApps.length >= this._max_items) + for (appId in this._appSet) { + if (matchedApps.length >= this._maxItems) break; - if (this._displayed[appid]) + if (this._displayed[appId]) continue; - let app = this._appset[appid]; - if (this._appinfoMatches(app, this._search)) - matchedApps.push(appid); + let app = this._appSet[appId]; + if (this._appInfoMatches(app, this._search)) + matchedApps.push(appId); } this._sortApps(matchedApps); for (let i = 0; i < matchedApps.length; i++) { @@ -288,8 +286,8 @@ AppDisplay.prototype = { }, _findDisplayedByActor: function(actor) { - for (appid in this._displayed) { - let item = this._displayed[appid]; + for (appId in this._displayed) { + let item = this._displayed[appId]; if (item.actor == actor) { return item; } diff --git a/js/ui/main.js b/js/ui/main.js index 62fa65c41..fb07085fb 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -8,8 +8,8 @@ const Tweener = imports.tweener.tweener; const Panel = imports.ui.panel; const Overlay = imports.ui.overlay; -const RunDialog = imports.ui.run_dialog; -const WindowManager = imports.ui.windowmanager; +const RunDialog = imports.ui.runDialog; +const WindowManager = imports.ui.windowManager; const DEFAULT_BACKGROUND_COLOR = new Clutter.Color(); DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff); @@ -17,7 +17,7 @@ DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff); let panel = null; let overlay = null; let overlayActive = false; -let run_dialog = null; +let runDialog = null; let wm = null; // The "FrameTicker" object is an object used to feed new frames to Tweener @@ -103,15 +103,15 @@ function start() { global.connect('panel-run-dialog', function(panel) { // Make sure not more than one run dialog is shown. - if (!run_dialog) { - run_dialog = new RunDialog.RunDialog(); + if (!runDialog) { + runDialog = new RunDialog.RunDialog(); let end_handler = function() { - run_dialog.destroy(); - run_dialog = null; + runDialog.destroy(); + runDialog = null; }; - run_dialog.connect('run', end_handler); - run_dialog.connect('cancel', end_handler); - if (!run_dialog.show()) + runDialog.connect('run', end_handler); + runDialog.connect('cancel', end_handler); + if (!runDialog.show()) end_handler(); } }); diff --git a/js/ui/overlay.js b/js/ui/overlay.js index fc0b36ba3..68095bd40 100644 --- a/js/ui/overlay.js +++ b/js/ui/overlay.js @@ -13,7 +13,7 @@ const Panel = imports.ui.panel; const Meta = imports.gi.Meta; const Shell = imports.gi.Shell; const Big = imports.gi.Big; -const AppDisplay = imports.ui.appdisplay; +const AppDisplay = imports.ui.appDisplay; const OVERLAY_BACKGROUND_COLOR = new Clutter.Color(); OVERLAY_BACKGROUND_COLOR.from_pixel(0x000000ff); @@ -75,13 +75,13 @@ Sideshow.prototype = { let text = me._searchEntry.text; me._searchQueued = false; me._searchActive = text != ''; - me._appdisplay.setSearch(text); + me._appDisplay.setSearch(text); return false; }); }); this._searchEntry.connect('activate', function (se) { me._searchEntry.text = ''; - me._appdisplay.searchActivate(); + me._appDisplay.searchActivate(); return true; }); this._searchEntry.connect('key-press-event', function (se, e) { @@ -90,10 +90,10 @@ Sideshow.prototype = { me._searchEntry.text = ''; return true; } else if (code == 111) { - me._appdisplay.selectUp(); + me._appDisplay.selectUp(); return true; } else if (code == 116) { - me._appdisplay.selectDown(); + me._appDisplay.selectDown(); return true; } return false; @@ -108,19 +108,19 @@ Sideshow.prototype = { this.actor.add_actor(appsText); let menuY = appsText.y + appsText.height + 6; - this._appdisplay = new AppDisplay.AppDisplay(width, global.screen_height - menuY); - this._appdisplay.actor.x = SIDESHOW_PAD; - this._appdisplay.actor.y = menuY; - this.actor.add_actor(this._appdisplay.actor); + this._appDisplay = new AppDisplay.AppDisplay(width, global.screen_height - menuY); + this._appDisplay.actor.x = SIDESHOW_PAD; + this._appDisplay.actor.y = menuY; + this.actor.add_actor(this._appDisplay.actor); /* Proxy the activated signal */ - this._appdisplay.connect('activated', function(appdisplay) { + this._appDisplay.connect('activated', function(appDisplay) { me.emit('activated'); }); }, show: function() { - this._appdisplay.show(); + this._appDisplay.show(); }, hide: function() { diff --git a/js/ui/run_dialog.js b/js/ui/runDialog.js similarity index 100% rename from js/ui/run_dialog.js rename to js/ui/runDialog.js diff --git a/js/ui/windowmanager.js b/js/ui/windowManager.js similarity index 100% rename from js/ui/windowmanager.js rename to js/ui/windowManager.js