Skip to content

Commit

Permalink
Version x.0.39.4
Browse files Browse the repository at this point in the history
- Translations added and updated.
- A little fix that automaticly updates launchers to the new lower case format added.
- Changelog updated.
  • Loading branch information
Matias Särs committed Jun 24, 2010
1 parent e5db4f4 commit d84cc9f
Show file tree
Hide file tree
Showing 15 changed files with 1,849 additions and 1,700 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
Changelog:

x.0.39.4
End user features:
- DockbarX can now pin wine applications and is better at recognizing wine application launchers automatically.
- The preference dialog is redeisgned to take less space (should even fit a eeepc 700 screen now) and to have the options in more intuitive places.
- Changing between showing and not showing previews doesn't require reloading DockbarX anymore.
- New translations added.

Bug fixes:
- Drag and drop for multiple files works now.
- Titles in Asian languages should use the correct font attributes for the whole window titles, instead getting the right attribute only for the first 50 letters.

x.0.39.3
End user features:
- Global shortcuts added. You can now cykel through groups or through windows within a group. See Advanced tab of preference window. New dependency: python-keybinder.
Expand Down
52 changes: 27 additions & 25 deletions dockbarx/dockbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import i18n
_ = i18n.language.gettext

VERSION = 'x.0.39.3-1+bzr'
VERSION = 'x.0.39.4'


ATOM_WM_CLASS = gtk.gdk.atom_intern("WM_CLASS")
Expand Down Expand Up @@ -95,7 +95,7 @@ def __iter__(self):
def __len__(self):
return self.list.__len__()

def add_group(self, identifier, group_button,
def add_group(self, identifier, group_button,
path_to_launcher=None, index=None):
t = (identifier, group_button, path_to_launcher)
if index:
Expand Down Expand Up @@ -293,10 +293,10 @@ def __init__(self,applet):
("Pref", self.on_ppm_pref),
("Reload", self.reload)]
self.applet.setup_menu(self.pp_menu_xml, self.pp_menu_verbs,None)
self.applet_origin_x = -1000
self.applet_origin_y = -1000
self.applet_origin_x = -1000
self.applet_origin_y = -1000
# background bug workaround
self.applet.set_background_widget(applet)
self.applet.set_background_widget(applet)
self.applet.show_all()
else:
self.container = gtk.HBox()
Expand Down Expand Up @@ -373,7 +373,7 @@ def reload(self, event=None, data=None):
self.app_ids_by_exec[exe] = id
else:
self.app_ids_by_exec[exe] = id



try:
Expand Down Expand Up @@ -401,6 +401,8 @@ def reload(self, event=None, data=None):
# Initiate launcher group buttons
for launcher in gconf_launchers:
identifier, path = launcher.split(';')
# Fix for launchers made in previous version of dockbarx
identifier = identifier.lower()
if identifier == '':
identifier = None
try:
Expand Down Expand Up @@ -431,19 +433,19 @@ def reload(self, event=None, data=None):

self.screen.connect("window-opened", self.on_window_opened)
self.screen.connect("window-closed", self.on_window_closed)
self.screen.connect("active-window-changed",
self.screen.connect("active-window-changed",
self.on_active_window_changed)
self.screen.connect("viewports-changed",
self.screen.connect("viewports-changed",
self.on_desktop_changed)
self.screen.connect("active-workspace-changed",
self.screen.connect("active-workspace-changed",
self.on_desktop_changed)

self.on_active_window_changed(self.screen, None)


def reset_all_surfaces(self):
# Removes all saved pixbufs with active glow in groupbuttons
# iconfactories. Use this def when the looks of active glow
# Removes all saved pixbufs with active glow in groupbuttons
# iconfactories. Use this def when the looks of active glow
# has been changed.
for group in self.groups.get_groups():
group.icon_factory.reset_surfaces()
Expand Down Expand Up @@ -551,7 +553,7 @@ def on_window_closed(self,screen,window):

def on_window_opened(self,screen,window):
if window.is_skip_tasklist() \
or not (window.get_window_type() in [wnck.WINDOW_NORMAL,
or not (window.get_window_type() in [wnck.WINDOW_NORMAL,
wnck.WINDOW_DIALOG]):
return

Expand Down Expand Up @@ -605,7 +607,7 @@ def on_window_opened(self,screen,window):
app = None
else:
app = self.find_gio_app(identifier)
self.make_groupbutton(class_group,
self.make_groupbutton(class_group,
identifier=identifier,
app=app)
self.groups[identifier].add_window(window)
Expand Down Expand Up @@ -740,7 +742,7 @@ def on_desktop_changed(self, screen=None, workspace=None):


#### Groupbuttons
def make_groupbutton(self, class_group=None, identifier=None,
def make_groupbutton(self, class_group=None, identifier=None,
launcher=None, app=None, path=None, index=None):
gb = GroupButton(class_group, identifier, launcher, app)
if index == None:
Expand Down Expand Up @@ -785,7 +787,7 @@ def on_unpinned(self, arg, identifier):
gb.app = self.globals.apps_by_id[app_id]
else:
gb.app = self.find_gio_app(identifier)
gb.icon_factory.remove_launcher(class_group=gb.class_group,
gb.icon_factory.remove_launcher(class_group=gb.class_group,
app = gb.app)
gb.update_name()
self.update_launchers_list()
Expand All @@ -801,17 +803,17 @@ def on_minimize_others(self, arg, gb):

#### Launchers
def add_launcher(self, identifier, path):
# Path either points to the path where the launcher.desktop can be
# Path either points to the path where the launcher.desktop can be
# found or tells which gio app the launcher will use (eg. "gio:gedit").
launcher = Launcher(identifier, path)
self.make_groupbutton(identifier=identifier,
self.make_groupbutton(identifier=identifier,
launcher=launcher, path = path)
if identifier == None:
# identifier should only be None if the launcher is dropped,
# in other words: not of gio-app type.
id = path[path.rfind('/')+1:path.rfind('.')].lower()
self.launchers_by_id[id] = launcher

exe = launcher.get_executable()
if self.globals.settings["separate_wine_apps"] \
and "wine" in exe and ".exe" in exe:
Expand All @@ -829,7 +831,7 @@ def add_launcher(self, identifier, path):
if exe.find('.')>-1:
exe = exe[:exe.rfind('.')]
self.launcher_ids_by_exec[exe] = id

name = u""+launcher.get_entry_name().lower()
if name.find(' ')>-1:
self.launcher_ids_by_longname[name] = id
Expand Down Expand Up @@ -924,7 +926,7 @@ def on_launcher_dropped(self, arg, path, calling_button):
# with the new launcher. Id, name and exe will be stored
# so that it can be checked against new windows later.
identifier = None

self.launchers_by_id[id] = launcher
if wine:
self.launcher_ids_by_wine_program[exe] = id
Expand Down Expand Up @@ -973,8 +975,8 @@ def on_launcher_dropped(self, arg, path, calling_button):
# Insert the new button after (to the
# right of or under) the calling button
index = self.groups.get_index(calling_button) + 1
self.make_groupbutton(class_group=class_group,
identifier=identifier, launcher=launcher,
self.make_groupbutton(class_group=class_group,
identifier=identifier, launcher=launcher,
index=index, path=path)
self.update_launchers_list()
for window in winlist:
Expand Down Expand Up @@ -1007,7 +1009,7 @@ def identifier_dialog(self, identifier=None):
entry = combobox.get_child()
#entry.set_text('')
#allow the user to press enter to do ok
entry.connect("activate",
entry.connect("activate",
lambda widget: dialog.response(gtk.RESPONSE_OK))
hbox = gtk.HBox()
hbox.pack_start(gtk.Label(_('Identifier:')), False, 5, 5)
Expand Down Expand Up @@ -1079,9 +1081,9 @@ def update_launchers_list(self):

def remove_launcher_id_from_undefined_list(self, id):
self.launchers_by_id.pop(id)
for l in (self.launcher_ids_by_name,
for l in (self.launcher_ids_by_name,
self.launcher_ids_by_exec,
self.launcher_ids_by_longname,
self.launcher_ids_by_longname,
self.launcher_ids_by_wine_program):
for key, value in l.items():
if value == id:
Expand Down
4 changes: 2 additions & 2 deletions po-themes/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: dockbar\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-06-09 13:23+0300\n"
"PO-Revision-Date: 2010-06-10 11:23+0000\n"
"PO-Revision-Date: 2010-06-10 19:46+0000\n"
"Last-Translator: Jan-Christoph Borchardt <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-10 14:20+0000\n"
"X-Launchpad-Export-Date: 2010-06-23 12:20+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Popup background"
Expand Down
12 changes: 6 additions & 6 deletions po-themes/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: dockbar\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-06-09 13:23+0300\n"
"PO-Revision-Date: 2010-06-10 12:08+0000\n"
"Last-Translator: weiss <[email protected]>\n"
"PO-Revision-Date: 2010-06-13 20:28+0000\n"
"Last-Translator: kreo#318 <Unknown>\n"
"Language-Team: Russian <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-10 14:20+0000\n"
"X-Launchpad-Export-Date: 2010-06-23 12:20+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Popup background"
Expand All @@ -30,7 +30,7 @@ msgid "Minimized window text"
msgstr "Текст свернутого окна"

msgid "Active color"
msgstr ""
msgstr "Активный цвет"

msgid "Not used"
msgstr "Не используется"
Expand All @@ -39,7 +39,7 @@ msgid "Active"
msgstr "Активно"

msgid "Launching color"
msgstr ""
msgstr "Цвет запуска"

msgid "Attention color"
msgstr ""
Expand All @@ -51,7 +51,7 @@ msgid "Active glow"
msgstr ""

msgid "Button color"
msgstr ""
msgstr "Цвет кнопки"

msgid "Active + indicator color"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion po-themes/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-10 14:20+0000\n"
"X-Launchpad-Export-Date: 2010-06-23 12:20+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Popup background"
Expand Down
Loading

0 comments on commit d84cc9f

Please sign in to comment.