diff -Nru kde-guidance-0.8.0svn20080103/debian/changelog kde-guidance-0.8.0svn20080103/debian/changelog --- kde-guidance-0.8.0svn20080103/debian/changelog 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/debian/changelog 2008-04-13 13:06:47.000000000 -0400 @@ -1,3 +1,20 @@ +kde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low + + [ Andreas Wenning ] + * Added kubuntu_29_kde-powermanager_display_consumption_rate.patch to + display current consumption rate. (LP: #214774). + * Readded kubuntu_30_displayconfig_no_xorg_correct_detection.patch + which doesn't break the api. displayconfig will detect the hardware + automatically and write a xorg.conf if none is present on startup. + (LP: #203378). + + [ Yuriy Kozlov ] + * Added kubuntu_31_wineconfig_no_i18_on_keys.patch to remove i18n from + dictionary keys, which caused crashes on non en_US locales. Should be + removed if synced with upstream. (LP: #82723) + + -- Yuriy Kozlov Sun, 13 Apr 2008 12:49:35 -0400 + kde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low * Disable kubuntu_30_displayconfig_no_xorg_correct_detection.patch. It diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_29_kde-powermanager_display_consumption_rate.patch /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_29_kde-powermanager_display_consumption_rate.patch --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_29_kde-powermanager_display_consumption_rate.patch 1969-12-31 19:00:00.000000000 -0500 +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_29_kde-powermanager_display_consumption_rate.patch 2008-04-13 13:06:47.000000000 -0400 @@ -0,0 +1,34 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py +--- kde-guidance-0.8.0svn20080103/powermanager/guidance-power-manager.py 2008-04-09 21:43:46.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/powermanager/guidance-power-manager.py 2008-04-09 21:44:53.000000000 +0200 +@@ -636,7 +636,7 @@ + self.batt_rate = self.batt_charge = self.batt_full = 0 + for batt in self.powermanager.batteries: + state, level, remain, rate, current, full = self.powermanager.getBatteryState(batt) +- self._updateBatteryWidget(batt, state, level, remain) ++ self._updateBatteryWidget(batt, state, level, remain, rate) + + ## notify plugged/unplugged batteries + if state == "not present": +@@ -770,7 +770,7 @@ + i += 1 + + +- def _updateBatteryWidget(self, batt, state, level, remain): ++ def _updateBatteryWidget(self, batt, state, level, remain, rate): + """ Retrieve battery information and update the related widgets accordingly. """ + self.BattProgress[batt].setEnabled(True) + self.BattProgress[batt].setTotalSteps(100) +@@ -780,7 +780,11 @@ + elif state == "charging": + self.BattProgress[batt].setFormat(i18n("Charging (%p%)")) + elif state == "discharging": +- self.BattProgress[batt].setFormat(i18n("Discharging (%p%)")) ++ if rate > 0: ++ showrate = rate/1000 ++ self.BattProgress[batt].setFormat(i18n("Discharging (%p%)") + " - %.d W" % showrate) ++ else: ++ self.BattProgress[batt].setFormat(i18n("Discharging (%p%)")) + else: + self.BattProgress[batt].setFormat("%p%") + diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch 1969-12-31 19:00:00.000000000 -0500 +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch 2008-04-13 13:06:47.000000000 -0400 @@ -0,0 +1,55 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/displayconfigabstraction.py kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfigabstraction.py +--- kde-guidance-0.8.0svn20080103/displayconfig/displayconfigabstraction.py 2008-04-13 17:34:19.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfigabstraction.py 2008-04-13 17:37:25.000000000 +0200 +@@ -72,11 +72,12 @@ + ROLE_PRIMARY = 1 + ROLE_SECONDARY = 2 + +- def __init__(self,xorg_config_filename='/etc/X11/xorg.conf',debug_scan_pci_filename=None): ++ def __init__(self,xorg_config_filename='/etc/X11/xorg.conf',debug_scan_pci_filename=None,secondtry=False): + self.screens = [] + self.gfxcards = [] +- self.xorg_config = xorgconfig.readConfig(xorg_config_filename) +- self.xorg_config_filename = xorg_config_filename ++ self.xorg_config, self.hasxorg = xorgconfig.readConfig(xorg_config_filename, check_exists=True) ++ if not secondtry: ++ self.xorg_config_filename = xorg_config_filename + self.x_live_info = xf86misc.XF86Server() + + self.primary_screen = None +@@ -391,6 +392,11 @@ + break + + self._finalizeInit() ++ ++ if not self.hasxorg and not secondtry: ++ """No xorg.conf, so we need to write a temporary one and reload from that one""" ++ self.writeXorgConfig('/tmp/xorg.conf.displayconfig') ++ self.__init__(xorg_config_filename='/tmp/xorg.conf.displayconfig',secondtry=True) + return + + def _finalizeInit(self): +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/xorgconfig.py kde-guidance-0.8.0svn20080103.new/displayconfig/xorgconfig.py +--- kde-guidance-0.8.0svn20080103/displayconfig/xorgconfig.py 2008-04-13 17:34:19.000000000 +0200 ++++ kde-guidance-0.8.0svn20080103.new/displayconfig/xorgconfig.py 2008-04-13 17:36:02.000000000 +0200 +@@ -736,7 +736,7 @@ + return context, section, stack, first + + ############################################################################ +-def readConfig(filename): ++def readConfig(filename, check_exists=False): + + context = XorgConfig() + stack = [] +@@ -795,7 +795,10 @@ + raise ParseException,"Unexpected end of file on line %i" % line + if not hasserverlayout and hasxorg: + addServerLayout(context, section, stack, first) +- return context ++ if check_exists: ++ return context, hasxorg ++ else: ++ return context + + ############################################################################ + class ParseException(Exception): diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch.disabled /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch.disabled --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch.disabled 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_30_displayconfig_no_xorg_correct_detection.patch.disabled 1969-12-31 19:00:00.000000000 -0500 @@ -1,43 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/displayconfigabstraction.py kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfigabstraction.py ---- kde-guidance-0.8.0svn20080103/displayconfig/displayconfigabstraction.py 2008-04-10 01:17:04.000000000 +0200 -+++ kde-guidance-0.8.0svn20080103.new/displayconfig/displayconfigabstraction.py 2008-04-10 01:18:14.000000000 +0200 -@@ -72,11 +72,12 @@ - ROLE_PRIMARY = 1 - ROLE_SECONDARY = 2 - -- def __init__(self,xorg_config_filename='/etc/X11/xorg.conf',debug_scan_pci_filename=None): -+ def __init__(self,xorg_config_filename='/etc/X11/xorg.conf',debug_scan_pci_filename=None,secondtry=False): - self.screens = [] - self.gfxcards = [] -- self.xorg_config = xorgconfig.readConfig(xorg_config_filename) -- self.xorg_config_filename = xorg_config_filename -+ self.xorg_config, self.hasxorg = xorgconfig.readConfig(xorg_config_filename) -+ if not secondtry: -+ self.xorg_config_filename = xorg_config_filename - self.x_live_info = xf86misc.XF86Server() - - self.primary_screen = None -@@ -391,6 +392,11 @@ - break - - self._finalizeInit() -+ -+ if not self.hasxorg and not secondtry: -+ """No xorg.conf, so we need to write a temporary one and reload from that one""" -+ self.writeXorgConfig('/tmp/xorg.conf.displayconfig') -+ self.__init__(xorg_config_filename='/tmp/xorg.conf.displayconfig',secondtry=True) - return - - def _finalizeInit(self): -diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/displayconfig/xorgconfig.py kde-guidance-0.8.0svn20080103.new/displayconfig/xorgconfig.py ---- kde-guidance-0.8.0svn20080103/displayconfig/xorgconfig.py 2008-04-10 01:17:03.000000000 +0200 -+++ kde-guidance-0.8.0svn20080103.new/displayconfig/xorgconfig.py 2008-04-10 01:17:05.000000000 +0200 -@@ -795,7 +795,7 @@ - raise ParseException,"Unexpected end of file on line %i" % line - if not hasserverlayout and hasxorg: - addServerLayout(context, section, stack, first) -- return context -+ return context, hasxorg - - ############################################################################ - class ParseException(Exception): diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch 1969-12-31 19:00:00.000000000 -0500 +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch 2008-04-13 13:06:47.000000000 -0400 @@ -0,0 +1,422 @@ +diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/wineconfig/wineconfig.py kde-guidance-0.8.0svn20080103.new/wineconfig/wineconfig.py +--- kde-guidance-0.8.0svn20080103/wineconfig/wineconfig.py 2008-01-03 11:26:48.000000000 -0500 ++++ kde-guidance-0.8.0svn20080103.new/wineconfig/wineconfig.py 2008-04-13 12:44:36.000000000 -0400 +@@ -1529,11 +1529,11 @@ + # and size values and translations for that item + # For example, the value of BorderWidth is + # customizableitems[str(i18n("Window Border"))][1]["BorderWidth"][1] +- customizableitems = {unicode(i18n("Window Border")): ++ customizableitems = {"Window Border": + ({"ActiveBorder":[unicode(i18n("Active Color:")),QColor()], + "InactiveBorder":[unicode(i18n("Inactive Color:")),QColor()]}, + {"BorderWidth":[unicode(i18n("Width:")),1]}), #ActiveBorder, InactiveBorder, metrics: BorderWidth +- unicode(i18n("Title Bar")): ++ "Title Bar": + ({"ActiveTitle":[unicode(i18n("Active Color:")),QColor()], + "GradientActiveTitle":[unicode(i18n("Gradient:")),QColor()], + "InactiveTitle":[unicode(i18n("Inactive Color:")),QColor()], +@@ -1541,10 +1541,10 @@ + "TitleText":[unicode(i18n("Active Text:")),QColor()], + "InactiveTitleText":[unicode(i18n("Inactive Text:")),QColor()]}, + {}), #ActiveTitle, GradientActiveTitle, InactiveTitle, GradientInactiveTitle, TitleText, InactiveTitleText +- unicode(i18n("Application Workspace")): ++ "Application Workspace": + ({"AppWorkSpace":[unicode(i18n("Background Color:")),QColor()]}, + {}), #AppWorkSpace "Background" +- unicode(i18n("Buttons")): ++ "Buttons": + ({"ButtonFace":[unicode(i18n("Face:")),QColor()], + "ButtonHilight":[unicode(i18n("Hilight:")),QColor()], + "ButtonLight":[unicode(i18n("Light:")),QColor()], +@@ -1554,27 +1554,27 @@ + "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor()], + "WindowFrame":[unicode(i18n("Frame:")),QColor()]}, + {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame +- unicode(i18n("Caption Buttons")): ++ "Caption Buttons": + ({}, + {"CaptionHeight":[unicode(i18n("Height:")),1], + "CaptionWidth":[unicode(i18n("Width:")),1]}), #Metrics: CaptionHeight, CaptionWidth +- unicode(i18n("Desktop")): ++ "Desktop": + ({"Background":[unicode(i18n("Background:")),QColor()]}, + {}), #Background +- unicode(i18n("Menu")): ++ "Menu": + ({"Menu":[unicode(i18n("Menu Background:")),QColor()], + "MenuBar":[unicode(i18n("Menu Bar Color:")),QColor()], + "MenuHilight":[unicode(i18n("Menu Hilight:")),QColor()], + "MenuText":[unicode(i18n("Text Color:")),QColor()]}, + {"MenuHeight":[unicode(i18n("Menu Bar Height:")),1]}), #Menu (Background), MenuBar, MenuHilight, MenuText, metrics: MenuHeight, MenuWidth (does nothing) +- unicode(i18n("Scrollbar")): ++ "Scrollbar": + ({"Scrollbar":[unicode(i18n("Color:")),QColor()]}, + {"ScrollWidth":[unicode(i18n("Width:")),1]}), #Scrollbar, metrics: ScrollHeight (does nothing), ScrollWidth +- unicode(i18n("Window")): ++ "Window": + ({"Window":[unicode(i18n("Background:")),QColor()], + "WindowText":[unicode(i18n("Text Color:")),QColor()]}, + {}), #Window "Background", WindowText +- unicode(i18n("Selected Items")): ++ "Selected Items": + ({"Hilight":[unicode(i18n("Hilight Color:")),QColor()], + "HilightText":[unicode(i18n("Text Color:")),QColor()]}, + {})} #Hilight, HilightText +@@ -1963,13 +1963,13 @@ + self.config.writeEntry("ColorScheme",self.currentcustomcolorscheme) + self.config.sync() + +- if self.customizableitems[unicode(i18n("Title Bar"))][0]["ActiveTitle"][1]\ ++ if self.customizableitems["Title Bar"][0]["ActiveTitle"][1]\ + !=\ +- self.customizableitems[unicode(i18n("Title Bar"))][0]["GradientActiveTitle"][1]\ ++ self.customizableitems["Title Bar"][0]["GradientActiveTitle"][1]\ + or\ +- self.customizableitems[unicode(i18n("Title Bar"))][0]["InactiveTitle"][1]\ ++ self.customizableitems["Title Bar"][0]["InactiveTitle"][1]\ + !=\ +- self.customizableitems[unicode(i18n("Title Bar"))][0]["GradientInactiveTitle"][1]: ++ self.customizableitems["Title Bar"][0]["GradientInactiveTitle"][1]: + prefmask = self.desktopsettings["UserPreferencemask"] + prefmask = prefmask[:4] + "1" + prefmask[5:] + self.desktopsettings["UserPreferencemask"] = prefmask +@@ -2008,10 +2008,10 @@ + items = self.customizableitems.keys() + items.sort() + for item in items: +- if not (allowwm and (item == unicode(i18n("Window Border")) \ +- or item == unicode(i18n("Title Bar")) or \ +- item == unicode(i18n("Caption Buttons")))): +- combo.insertItem(item) ++ if not (allowwm and (item == "Window Border" \ ++ or item == "Title Bar" or \ ++ item == "Caption Buttons")): ++ combo.insertItem(unicode(i18n(item))) + + def slotFillItemComboDesktop(self,desktop): + """ +@@ -2029,10 +2029,10 @@ + items.sort() + self.currentitems = [] + for item in items: +- if not (currentallowwm == 'Y' and (item == unicode(i18n("Window Border")) \ +- or item == unicode(i18n("Title Bar")) or \ +- item == unicode(i18n("Caption Buttons")))): +- combo.insertItem(item) ++ if not (currentallowwm == 'Y' and (item == "Window Border" \ ++ or item == "Title Bar" or \ ++ item == "Caption Buttons")): ++ combo.insertItem(unicode(i18n(item))) + self.currentitems.append(item) + + def slotThemeActivated(self,themeid): +@@ -2114,63 +2114,63 @@ + config = KConfig("kdesktoprc") + + config.setGroup("General") +- self.customizableitems[unicode(i18n("Application Workspace"))][0]["AppWorkSpace"][1] =\ ++ self.customizableitems["Application Workspace"][0]["AppWorkSpace"][1] =\ + config.readColorEntry("background",QColor(100,100,100)) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonFace"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonFace"][1] =\ + config.readColorEntry("background",QColor(230,230,230)) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonHilight"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonHilight"][1] =\ + config.readColorEntry("windowBackground",QColor(240,240,240)) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonLight"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonLight"][1] =\ + config.readColorEntry("selectBackground",QColor(200,200,200)).light(135) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonShadow"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonShadow"][1] =\ + config.readColorEntry("background",QColor(100,100,100)).dark(180) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonText"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonText"][1] =\ + config.readColorEntry("buttonForeground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonAlternateFace"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonAlternateFace"][1] =\ + config.readColorEntry("background",QColor(230,230,230)) +- self.customizableitems[unicode(i18n("Buttons"))][0]["ButtonDkShadow"][1] =\ ++ self.customizableitems["Buttons"][0]["ButtonDkShadow"][1] =\ + config.readColorEntry("selectBackground",QColor(0,0,0)).dark(146) +- self.customizableitems[unicode(i18n("Buttons"))][0]["WindowFrame"][1] =\ ++ self.customizableitems["Buttons"][0]["WindowFrame"][1] =\ + config.readColorEntry("selectBackground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Menu"))][0]["Menu"][1] =\ ++ self.customizableitems["Menu"][0]["Menu"][1] =\ + config.readColorEntry("background",QColor(230,230,230)).light(105) +- self.customizableitems[unicode(i18n("Menu"))][0]["MenuBar"][1] =\ ++ self.customizableitems["Menu"][0]["MenuBar"][1] =\ + config.readColorEntry("background",QColor(230,230,230)) +- self.customizableitems[unicode(i18n("Menu"))][0]["MenuHilight"][1] =\ ++ self.customizableitems["Menu"][0]["MenuHilight"][1] =\ + config.readColorEntry("selectBackground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Menu"))][0]["MenuText"][1] =\ ++ self.customizableitems["Menu"][0]["MenuText"][1] =\ + config.readColorEntry("foreground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Scrollbar"))][0]["Scrollbar"][1] =\ ++ self.customizableitems["Scrollbar"][0]["Scrollbar"][1] =\ + config.readColorEntry("background",QColor(230,230,230)) +- self.customizableitems[unicode(i18n("Window"))][0]["Window"][1] =\ ++ self.customizableitems["Window"][0]["Window"][1] =\ + config.readColorEntry("windowBackground",QColor(255,255,255)) +- self.customizableitems[unicode(i18n("Window"))][0]["WindowText"][1] =\ ++ self.customizableitems["Window"][0]["WindowText"][1] =\ + config.readColorEntry("foreground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Selected Items"))][0]["Hilight"][1] =\ ++ self.customizableitems["Selected Items"][0]["Hilight"][1] =\ + config.readColorEntry("selectBackground",QColor(0,0,0)) +- self.customizableitems[unicode(i18n("Selected Items"))][0]["HilightText"][1] =\ ++ self.customizableitems["Selected Items"][0]["HilightText"][1] =\ + config.readColorEntry("selectForeground",QColor(255,255,255)) + + config.setGroup("WM") +- self.customizableitems[unicode(i18n("Title Bar"))][0]["ActiveTitle"][1] =\ ++ self.customizableitems["Title Bar"][0]["ActiveTitle"][1] =\ + config.readColorEntry("activeBackground",QColor(10,10,100)) +- self.customizableitems[unicode(i18n("Title Bar"))][0]["GradientActiveTitle"][1] =\ ++ self.customizableitems["Title Bar"][0]["GradientActiveTitle"][1] =\ + config.readColorEntry("activeBlend",QColor(10,10,200)).light(110) +- self.customizableitems[unicode(i18n("Title Bar"))][0]["InactiveTitle"][1] =\ ++ self.customizableitems["Title Bar"][0]["InactiveTitle"][1] =\ + config.readColorEntry("inactiveBackground",QColor(100,100,100)) +- self.customizableitems[unicode(i18n("Title Bar"))][0]["GradientInactiveTitle"][1] =\ ++ self.customizableitems["Title Bar"][0]["GradientInactiveTitle"][1] =\ + config.readColorEntry("inactiveBlend",QColor(100,100,200)) +- self.customizableitems[unicode(i18n("Title Bar"))][0]["TitleText"][1] =\ ++ self.customizableitems["Title Bar"][0]["TitleText"][1] =\ + config.readColorEntry("activeForeground",QColor(255,255,255)) +- self.customizableitems[unicode(i18n("Title Bar"))][0]["InactiveTitleText"][1] =\ ++ self.customizableitems["Title Bar"][0]["InactiveTitleText"][1] =\ + config.readColorEntry("inactiveForeground",QColor(250,250,250)) +- self.customizableitems[unicode(i18n("Window Border"))][0]["ActiveBorder"][1] =\ ++ self.customizableitems["Window Border"][0]["ActiveBorder"][1] =\ + config.readColorEntry("frame",QColor(10,10,100)) +- self.customizableitems[unicode(i18n("Window Border"))][0]["InactiveBorder"][1] =\ ++ self.customizableitems["Window Border"][0]["InactiveBorder"][1] =\ + config.readColorEntry("frame",QColor(100,100,200)) + + config.setGroup("Desktop0") +- self.customizableitems[unicode(i18n("Desktop"))][0]["Background"][1] =\ ++ self.customizableitems["Desktop"][0]["Background"][1] =\ + config.readColorEntry("Color1",QColor(50,150,85)) + + self.saveColorScheme(self.colorschemes[1]) +@@ -2238,7 +2238,7 @@ + self.GetKdeColorScheme() + + if not self.selecteditem: +- self.__selectItem(unicode(i18n("Desktop"))) ++ self.__selectItem("Desktop") + else: + self.__selectItem(self.selecteditem) + +@@ -2263,7 +2263,7 @@ + if item1 == item: + self.itemcombo.setCurrentItem(i) + +- if item == unicode(i18n("Application Workspace")): ++ if item == "Application Workspace": + key = "AppWorkSpace" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2283,7 +2283,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Buttons")): ++ elif item == "Buttons": + key = "ButtonFace" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2379,7 +2379,7 @@ + self.colorcombo8.setColor(\ + self.customizableitems[item][0][key][1]) + self.colorcombo8.setName(key) +- elif item == unicode(i18n("Caption Buttons")): ++ elif item == "Caption Buttons": + key = "CaptionHeight" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2414,7 +2414,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Desktop")): ++ elif item == "Desktop": + key = "Background" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2434,7 +2434,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Menu")): ++ elif item == "Menu": + key = "Menu" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2500,7 +2500,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Scrollbar")): ++ elif item == "Scrollbar": + key = "Scrollbar" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2533,7 +2533,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Selected Items")): ++ elif item == "Selected Items": + key = "Hilight" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2564,7 +2564,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Title Bar")): ++ elif item == "Title Bar": + key = "ActiveTitle" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2639,7 +2639,7 @@ + + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Window")): ++ elif item == "Window": + key = "Window" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2670,7 +2670,7 @@ + self.colorsizehbox6.hide() + self.colorsizehbox7.hide() + self.colorsizehbox8.hide() +- elif item == unicode(i18n("Window Border")): ++ elif item == "Window Border": + key = "ActiveBorder" + self.colorsizehbox1.show() + self.colorsizetext1.setText(\ +@@ -2733,11 +2733,11 @@ + + # --- Some default color schemes, with names --- + preset1 = (unicode(i18n("Purple")), +- {unicode(i18n("Window Border")): ++ {"Window Border": + ({"ActiveBorder":[unicode(i18n("Active Color:")),QColor(239,239,239)], + "InactiveBorder":[unicode(i18n("Inactive Color:")),QColor(239,239,239)]}, + {"BorderWidth":[unicode(i18n("Width:")),1]}), #ActiveBorder, InactiveBorder, metrics: BorderWidth +- unicode(i18n("Title Bar")): ++ "Title Bar": + ({"ActiveTitle":[unicode(i18n("Active Color:")),QColor(91,86,168)], + "GradientActiveTitle":[unicode(i18n("Gradient:")),QColor(136,118,202)], + "InactiveTitle":[unicode(i18n("Inactive Color:")),QColor(223,225,230)], +@@ -2745,10 +2745,10 @@ + "TitleText":[unicode(i18n("Active Text:")),QColor(255,255,255)], + "InactiveTitleText":[unicode(i18n("Inactive Text:")),QColor(168,168,168)]}, + {}), #ActiveTitle, GradientActiveTitle, InactiveTitle, GradientInactiveTitle, TitleText, InactiveTitleText +- unicode(i18n("Application Workspace")): ++ "Application Workspace": + ({"AppWorkSpace":[unicode(i18n("Background Color:")),QColor(90,90,90)]}, + {}), #AppWorkSpace "Background" +- unicode(i18n("Buttons")): ++ "Buttons": + ({"ButtonFace":[unicode(i18n("Face:")),QColor(238,239,242)], + "ButtonHilight":[unicode(i18n("Hilight:")),QColor(255,255,255)], + "ButtonLight":[unicode(i18n("Light:")),QColor(201,199,255)], +@@ -2758,37 +2758,37 @@ + "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor(98,96,143)], + "WindowFrame":[unicode(i18n("Frame:")),QColor(144,140,209)]}, + {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame +- unicode(i18n("Caption Buttons")): ++ "Caption Buttons": + ({}, + {"CaptionHeight":[unicode(i18n("Height:")),22], + "CaptionWidth":[unicode(i18n("Width:")),22]}), #Metrics: CaptionHeight, CaptionWidth +- unicode(i18n("Desktop")): ++ "Desktop": + ({"Background":[unicode(i18n("Background:")),QColor(146,127,188)]}, + {}), #Background +- unicode(i18n("Menu")): ++ "Menu": + ({"Menu":[unicode(i18n("Menu Background:")),QColor(250,251,254)], + "MenuBar":[unicode(i18n("Menu Bar Color:")),QColor(238,239,242)], + "MenuHilight":[unicode(i18n("Menu Hilight:")),QColor(144,140,209)], + "MenuText":[unicode(i18n("Text Color:")),QColor(0,0,0)]}, + {"MenuHeight":[unicode(i18n("Menu Bar Height:")),22]}), #Menu (Background), MenuBar, MenuHilight, MenuText, metrics: MenuHeight, MenuWidth (does nothing) +- unicode(i18n("Scrollbar")): ++ "Scrollbar": + ({"Scrollbar":[unicode(i18n("Color:")),QColor(238,239,242)]}, + {"ScrollWidth":[unicode(i18n("Width:")),16]}), #Scrollbar, metrics: ScrollHeight (does nothing), ScrollWidth +- unicode(i18n("Window")): ++ "Window": + ({"Window":[unicode(i18n("Background:")),QColor(255,255,255)], + "WindowText":[unicode(i18n("Text Color:")),QColor(0,0,0)]}, + {}), #Window "Background", WindowText +- unicode(i18n("Selected Items")): ++ "Selected Items": + ({"Hilight":[unicode(i18n("Hilight Color:")),QColor(144,140,209)], + "HilightText":[unicode(i18n("Text Color:")),QColor(255,255,255)]}, + {})}) #Hilight, HilightText + + preset2 = (unicode(i18n("Blue")), +- {unicode(i18n("Window Border")): ++ {"Window Border": + ({"ActiveBorder":[unicode(i18n("Active Color:")),QColor(239,239,239)], + "InactiveBorder":[unicode(i18n("Inactive Color:")),QColor(239,239,239)]}, + {"BorderWidth":[unicode(i18n("Width:")),1]}), #ActiveBorder, InactiveBorder, metrics: BorderWidth +- unicode(i18n("Title Bar")): ++ "Title Bar": + ({"ActiveTitle":[unicode(i18n("Active Color:")),QColor(0,113,201)], + "GradientActiveTitle":[unicode(i18n("Gradient:")),QColor(87,161,219)], + "InactiveTitle":[unicode(i18n("Inactive Color:")),QColor(191,191,191)], +@@ -2796,10 +2796,10 @@ + "TitleText":[unicode(i18n("Active Text:")),QColor(255,255,255)], + "InactiveTitleText":[unicode(i18n("Inactive Text:")),QColor(95,95,95)]}, + {}), #ActiveTitle, GradientActiveTitle, InactiveTitle, GradientInactiveTitle, TitleText, InactiveTitleText +- unicode(i18n("Application Workspace")): ++ "Application Workspace": + ({"AppWorkSpace":[unicode(i18n("Background Color:")),QColor(90,90,90)]}, + {}), #AppWorkSpace "Background" +- unicode(i18n("Buttons")): ++ "Buttons": + ({"ButtonFace":[unicode(i18n("Face:")),QColor(239,239,239)], + "ButtonHilight":[unicode(i18n("Hilight:")),QColor(246,246,246)], + "ButtonLight":[unicode(i18n("Light:")),QColor(191,207,251)], +@@ -2809,27 +2809,27 @@ + "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor(50,101,146)], + "WindowFrame":[unicode(i18n("Frame:")),QColor(74,149,214)]}, + {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame +- unicode(i18n("Caption Buttons")): ++ "Caption Buttons": + ({}, + {"CaptionHeight":[unicode(i18n("Height:")),22], + "CaptionWidth":[unicode(i18n("Width:")),22]}), #Metrics: CaptionHeight, CaptionWidth +- unicode(i18n("Desktop")): ++ "Desktop": + ({"Background":[unicode(i18n("Background:")),QColor(44,109,189)]}, + {}), #Background +- unicode(i18n("Menu")): ++ "Menu": + ({"Menu":[unicode(i18n("Menu Background:")),QColor(249,249,249)], + "MenuBar":[unicode(i18n("Menu Bar Color:")),QColor(239,239,239)], + "MenuHilight":[unicode(i18n("Menu Hilight:")),QColor(74,149,214)], + "MenuText":[unicode(i18n("Text Color:")),QColor(0,0,0)]}, + {"MenuHeight":[unicode(i18n("Menu Bar Height:")),22]}), #Menu (Background), MenuBar, MenuHilight, MenuText, metrics: MenuHeight, MenuWidth (does nothing) +- unicode(i18n("Scrollbar")): ++ "Scrollbar": + ({"Scrollbar":[unicode(i18n("Color:")),QColor(230,230,230)]}, + {"ScrollWidth":[unicode(i18n("Width:")),16]}), #Scrollbar, metrics: ScrollHeight (does nothing), ScrollWidth +- unicode(i18n("Window")): ++ "Window": + ({"Window":[unicode(i18n("Background:")),QColor(255,255,255)], + "WindowText":[unicode(i18n("Text Color:")),QColor(0,0,0)]}, + {}), #Window "Background", WindowText +- unicode(i18n("Selected Items")): ++ "Selected Items": + ({"Hilight":[unicode(i18n("Hilight Color:")),QColor(74,149,214)], + "HilightText":[unicode(i18n("Text Color:")),QColor(255,255,255)]}, + {})}) #Hilight, HilightText diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/powermanager/guidance_power_manager_ui.py /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/powermanager/guidance_power_manager_ui.py --- kde-guidance-0.8.0svn20080103/powermanager/guidance_power_manager_ui.py 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/powermanager/guidance_power_manager_ui.py 2008-04-13 13:06:47.000000000 -0400 @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'guidance_power_manager_ui.ui' # -# Created: Thu Apr 10 00:50:39 2008 +# Created: Sun Apr 13 12:57:16 2008 # by: The PyQt User Interface Compiler (pyuic) 3.17.4 # # WARNING! All changes made in this file will be lost! diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/powermanager/notify.py /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/powermanager/notify.py --- kde-guidance-0.8.0svn20080103/powermanager/notify.py 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/powermanager/notify.py 2008-04-13 13:06:47.000000000 -0400 @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'notify.ui' # -# Created: Thu Apr 10 00:50:39 2008 +# Created: Sun Apr 13 12:57:17 2008 # by: The PyQt User Interface Compiler (pyuic) 3.17.4 # # WARNING! All changes made in this file will be lost! diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/powermanager/tooltip.py /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/powermanager/tooltip.py --- kde-guidance-0.8.0svn20080103/powermanager/tooltip.py 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/powermanager/tooltip.py 2008-04-13 13:06:47.000000000 -0400 @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'tooltip.ui' # -# Created: Thu Apr 10 00:50:39 2008 +# Created: Sun Apr 13 12:57:16 2008 # by: The PyQt User Interface Compiler (pyuic) 3.17.4 # # WARNING! All changes made in this file will be lost! diff -Nru /tmp/LADIO2IWZC/kde-guidance-0.8.0svn20080103/wineconfig/kcm_wineconfig.cpp /tmp/Gh6tDdkOge/kde-guidance-0.8.0svn20080103/wineconfig/kcm_wineconfig.cpp --- kde-guidance-0.8.0svn20080103/wineconfig/kcm_wineconfig.cpp 2008-04-13 13:06:47.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/wineconfig/kcm_wineconfig.cpp 2008-04-13 13:06:47.000000000 -0400 @@ -18,7 +18,7 @@ #include #include -#define MODULE_DIR "/home/jr/src/guidance/kde-guidance-0.8.0svn20080103/debian/tmp/usr/share/apps/guidance" +#define MODULE_DIR "/home/yuriy/guidance/kde-guidance-0.8.0svn20080103/debian/tmp/usr/share/apps/guidance" #define MODULE_NAME "wineconfig" #define FACTORY "create_wineconfig" #define CPP_FACTORY create_wineconfig