From f88ebcd183a003bc7a1afd0069ed4e1fb2912d28 Mon Sep 17 00:00:00 2001 From: Izhar Firdaus Date: Tue, 5 Apr 2011 11:06:05 +0800 Subject: add gnome-shell-dock patch and conkyrc --- conkyrc | 72 ++++++++++++++++++++++++++++ gnome-shell-dock.patch | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100755 conkyrc create mode 100644 gnome-shell-dock.patch diff --git a/conkyrc b/conkyrc new file mode 100755 index 0000000..a9dee2e --- /dev/null +++ b/conkyrc @@ -0,0 +1,72 @@ +#avoid flicker +double_buffer yes +#background yes + + +#own window to run simultanious 2 or more conkys +own_window yes +#own_window_transparent true +own_window_colour black +own_window_type panel +#own_window_hints undecorate,sticky,skip_taskbar,skip_pager,below +own_window_argb_visual yes +own_window_argb_value 180 +# +#borders +draw_borders no +border_outer_margin 0 +border_inner_margin 0 + +#shades +draw_shades no + +#position +gap_y 23 +gap_x 0 +alignment top_left + +#behaviour +update_interval 2 + +#colour +default_color ffffff +color2 FF5C6B +color3 929292 + +#default_shade_color 000000 +own_window_colour 000000 + +#font +use_xft yes +xftfont PF Tempesta Five Condensed:pixelsize=9 + +#to prevent window from moving +use_spacer none +minimum_size 1920 18 + + + +#mpd +#mpd_host localhost +#mpd_port 6600 +# +TEXT +${voffset 5} $nodename $kernel CPU @${freq_g 1}/${freq_g 2} ${ibm_temps 0}C ${voffset -5} ${cpugraph cpu0 12,50} ${cpugraph cpu1 12,20} ${cpugraph 12,20}${voffset 5} Memory ${mem}/${memperc}% ${voffset -5}${memgraph 12,50}${voffset 5} Wlan ${downspeed wlan0}/${upspeed wlan0} ${voffset -5}${downspeedgraph wlan0 12,50} ${upspeedgraph wlan0 12,50} +#${image ~/.conky/background.png -p 0,0 } +#${offset 20}${voffset -7}${font PF Tempesta Five Condensed:size=6:style=bold}${color2}[ ${color}$nodename $kernel${color2} ]${color}${font} +#${offset 35}${voffset 18}load ${loadavg 1} ${loadavg 2} ${loadavg 3} +#${offset 40}Uptime $uptime_short +#${offset 190}${voffset -62}CPU +#${offset 190}${voffset 18}Core1 ${cpugraph cpu1 10,40} +# +#${offset 190}Core2 ${offset 1}${cpugraph cpu2 10,40} +#${offset 290}${voffset -62}Memory +#${offset 290}${voffset 18}Used ${color2}[ ${color}$mem${color2} ]${color} +#${offset 290}$color3${membar 4,80} $color +#${offset 430}${voffset -62}HDD +#${offset 430}${voffset 18}root ${color2}[ ${color}${fs_used /}${color2} ]${color} home ${color2}[ ${color}${fs_used /home}${color2} ]${color} +##${offset 430}daten ${color2}[ ${color}${fs_used /media/disk2part1}${color2} ]${color} +#${offset 660}${voffset -62}Network +#${offset 660}${voffset 18}ip ${color2}[ ${color}${addr wlan0}${color2} ]${color} +#${offset 1780}${voffset -62}${time %A, %e. %B} +#${offset 1810}${voffset 18}${font NeoSans:size=20:style:bold}${time %H}:${font NeoSans:size=10}${offset -10}${voffset -10}${color2}${time %M}${color} diff --git a/gnome-shell-dock.patch b/gnome-shell-dock.patch new file mode 100644 index 0000000..05bfbbe --- /dev/null +++ b/gnome-shell-dock.patch @@ -0,0 +1,124 @@ +diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js +index 8af0d3e..faa71d8 100644 +--- a/extensions/dock/extension.js ++++ b/extensions/dock/extension.js +@@ -25,7 +25,7 @@ const AltTab = imports.ui.altTab; + const Gettext = imports.gettext.domain('gnome-shell-extensions'); + const _ = Gettext.gettext; + +-const DOCKICON_SIZE = 48; ++const DOCKICON_SIZE = 30; + const DND_RAISE_APP_TIMEOUT = 500; + + function Dock() { +@@ -91,6 +91,7 @@ Dock.prototype = { + let icons = 0; + + let nFavorites = 0; ++ + for (let id in favorites) { + let app = favorites[id]; + let display = new DockIcon(app); +@@ -120,7 +121,8 @@ Dock.prototype = { + let primary = global.get_primary_monitor(); + let height = (icons)*(this._item_size + this._spacing) + 2*this._spacing; + this.actor.set_size(this._item_size + 4*this._spacing, height); +- this.actor.set_position(primary.width-this._item_size-this._spacing-2, (primary.height-height)/2); ++// this.actor.set_position(primary.width-this._item_size-this._spacing-2, (primary.height-height)/2); ++ this.actor.set_position(-this._spacing-2, (primary.height-height)/2); + }, + + _getPreferredWidth: function (grid, forHeight, alloc) { +@@ -235,6 +237,7 @@ DockIcon.prototype = { + this._has_focus = false; + else + this._has_focus = true; ++ + return false; + }, + +@@ -289,6 +292,7 @@ DockIcon.prototype = { + this._removeMenuTimeout(); + this.actor.fake_release(); + ++ + if (!this._menu) { + this._menu = new DockIconMenu(this); + this._menu.connect('activate-window', Lang.bind(this, function (menu, window) { +@@ -302,7 +306,11 @@ DockIcon.prototype = { + this._menuManager.addMenu(this._menu, true); + } + +- this._menu.popup(); ++ if (!this._menu.isOpen) { ++ this._menu.popup(); ++ } else { ++ this._menu.close(true); ++ } + + return false; + }, +@@ -343,13 +351,14 @@ DockIcon.prototype = { + let focusedApp = tracker.focus_app; + + if (this.app == focusedApp) { +- let windows = this.app.get_windows(); ++ this.popupMenu(); ++/* let windows = this.app.get_windows(); + let current_workspace = global.screen.get_active_workspace(); + for (let i = 0; i < windows.length; i++) { + let w = windows[i]; + if (w.get_workspace() == current_workspace) + w.minimize(); +- } ++ }*/ + } else { + this.app.activate(-1); + } +@@ -371,7 +380,7 @@ DockIconMenu.prototype = { + __proto__: AppDisplay.AppIconMenu.prototype, + + _init: function(source) { +- PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.RIGHT, 0); ++ PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.LEFT, 0); + + this._source = source; + +@@ -400,6 +409,10 @@ DockIconMenu.prototype = { + let activeWorkspace = global.screen.get_active_workspace(); + let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace; + ++ this._newWindowMenuItem = windows.length > 0 ? this._appendMenuItem(_("New Window")) : null; ++ this._launchAppItem = windows.length == 0 ? this._appendMenuItem(_("Launch Application")) : null; ++ this._appendSeparator(); ++ + for (let i = 0; i < windows.length; i++) { + if (!separatorShown && windows[i].get_workspace() != activeWorkspace) { + this._appendSeparator(); +@@ -414,15 +427,14 @@ DockIconMenu.prototype = { + + let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id()); + +- this._newWindowMenuItem = windows.length > 0 ? this._appendMenuItem(_("New Window")) : null; + +- this._quitAppMenuItem = windows.length >0 ? this._appendMenuItem(_("Quit Application")) : null; ++/* this._quitAppMenuItem = windows.length >0 ? this._appendMenuItem(_("Quit Application")) : null; + + if (windows.length > 0) + this._appendSeparator(); + this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? + _("Remove from Favorites") +- : _("Add to Favorites")); ++ : _("Add to Favorites"));*/ + + this._highlightedItem = null; + }, +@@ -431,6 +443,8 @@ DockIconMenu.prototype = { + if (child._window) { + let metaWindow = child._window; + this.emit('activate-window', metaWindow); ++ } else if (child == this._launchAppItem) { ++ this._source.app.activate(-1); + } else if (child == this._newWindowMenuItem) { + let current_workspace = global.screen.get_active_workspace().index(); + this._source.app.open_new_window(current_workspace); -- cgit