Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mate-tweak for openSUSE:Factory checked in at 2021-05-16 23:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-tweak (Old) and /work/SRC/openSUSE:Factory/.mate-tweak.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-tweak" Sun May 16 23:42:04 2021 rev:28 rq:893500 version:21.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-tweak/mate-tweak.changes 2020-08-29 20:40:10.613410577 +0200 +++ /work/SRC/openSUSE:Factory/.mate-tweak.new.2988/mate-tweak.changes 2021-05-16 23:44:21.477082718 +0200 @@ -1,0 +2,16 @@ +Wed Mar 31 12:22:30 UTC 2021 - Alexei Sorokin <[email protected]> + +- Update to version 21.04.3: + * Drop MATE Dock requirement for Netbook layout. + * When switching to/from Mutiny update the Plank configuration + accordingly. + * Make Mutiny layout available if Plank is available. + + Mutiny no longer uses mate-dock-applet. + * Mutiny no longer uses Maximus or left-aligned window controls. + * Fallback to a sane default Plank theme when not using a known + GTK theme. + * When switching to Mutiny layout pick a suitable Plank theme + (lp#1917740). + * Keep Brisk menu label visible in the Mutiny layout. + +------------------------------------------------------------------- Old: ---- mate-tweak-20.04.0.tar.gz New: ---- mate-tweak-21.04.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-tweak.spec ++++++ --- /var/tmp/diff_new_pack.3Ss6t4/_old 2021-05-16 23:44:22.017080624 +0200 +++ /var/tmp/diff_new_pack.3Ss6t4/_new 2021-05-16 23:44:22.021080609 +0200 @@ -1,7 +1,7 @@ # # spec file for package mate-tweak # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _name mate_tweak Name: mate-tweak -Version: 20.04.0 +Version: 21.04.3 Release: 0 Summary: MATE desktop tweak tool License: GPL-2.0-or-later ++++++ mate-tweak-20.04.0.tar.gz -> mate-tweak-21.04.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-tweak-20.04.0/mate-tweak new/mate-tweak-21.04.3/mate-tweak --- old/mate-tweak-20.04.0/mate-tweak 2020-02-13 23:23:42.000000000 +0100 +++ new/mate-tweak-21.04.3/mate-tweak 2021-03-04 11:27:47.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (C) 2007-2014 by Clement Lefebvre <[email protected]> -# Copyright (C) 2015-2018 Martin Wimpress <[email protected]> +# Copyright (C) 2015-2021 Martin Wimpress <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ # Workaround introspection bug, gnome bug 622084 signal.signal(signal.SIGINT, signal.SIG_DFL) -__VERSION__ = '20.04.0' +__VERSION__ = '21.04.3' __TILDA__ = """[Desktop Entry] Name=Tilda @@ -90,73 +90,6 @@ X-MATE-Autostart-Notify=true """ -__INDICATOR_APPLICATION__ = """[Desktop Entry] -Type=Application -Name=Indicator Application -Exec=/usr/lib/MULTIARCH/indicator-application/indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - -__INDICATOR_DATETIME__ = """[Desktop Entry] -Type=Application -Name=Indicator Date and Time -Exec=/usr/lib/MULTIARCH/indicator-datetime/indicator-datetime-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - - -__INDICATOR_SOUND__ = """[Desktop Entry] -Type=Application -Name=Indicator Sound -Exec=/usr/lib/MULTIARCH/indicator-sound/indicator-sound-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - -__INDICATOR_MESSAGES__ = """[Desktop Entry] -Type=Application -Name=Indicator Messages -Exec=/usr/lib/MULTIARCH/indicator-messages/indicator-messages-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - -__INDICATOR_POWER__ = """[Desktop Entry] -Type=Application -Name=Indicator Power -Exec=/usr/lib/MULTIARCH/indicator-power/indicator-power-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - -__INDICATOR_SESSION__ = """[Desktop Entry] -Type=Application -Name=Indicator Session -Exec=/usr/lib/MULTIARCH/indicator-session/indicator-session-service -StartupNotify=false -Terminal=false -OnlyShowIn=MATE -NoDisplay=true -X-MATE-Autostart-enabled=true -""" - __TRADITIONAL_BUTTONS__ = ":minimize,maximize,close" __CONTEMPORARY_BUTTONS__ = "close,minimize,maximize:" __MENU_TRADITIONAL_BUTTONS__ = "menu:minimize,maximize,close" @@ -602,7 +535,7 @@ """ self.kill_process('mate-volume-control-applet') self.remove_autostart('mate-volume-control-applet.desktop') - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-power/indicator-power-service'): + if os.path.exists('/usr/libexec/ayatana-indicator-power/ayatana-indicator-power-service'): self.set_string('org.mate.power-manager', None, 'icon-policy', 'never') self.set_bool('org.mate.power-manager', None, 'notify-low-capacity', False) @@ -618,7 +551,7 @@ pid = subprocess.Popen(['mate-volume-control-applet'], stdout=DEVNULL, stderr=DEVNULL).pid self.remove_autostart('mate-volume-control-applet.desktop') self.create_autostart('mate-volume-control-applet.desktop', __APPLET_SOUND__) - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-power/indicator-power-service'): + if os.path.exists('/usr/libexec/ayatana-indicator-power/ayatana-indicator-power-service'): self.set_string('org.mate.power-manager', None, 'icon-policy', 'present') self.set_bool('org.mate.power-manager', None, 'notify-low-capacity', True) @@ -626,51 +559,6 @@ # Note the double .desktop suffix. self.remove_autostart('mate-volume-control-applet.desktop.desktop') - def disable_indicators(self): - self.kill_process('indicator-session-service') - self.kill_process('indicator-power-service') - self.kill_process('indicator-messages-service') - self.kill_process('indicator-sound-service') - self.kill_process('indicator-datetime-service') - self.kill_process('indicator-application-service') - self.remove_autostart('indicator-application.desktop') - self.remove_autostart('indicator-datetime.desktop') - self.remove_autostart('indicator-sound.desktop') - self.remove_autostart('indicator-messages.desktop') - self.remove_autostart('indicator-power.desktop') - self.remove_autostart('indicator-session.desktop') - - def enable_indicators(self): - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-application/indicator-application-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-application/indicator-application-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_application_autostart = __INDICATOR_APPLICATION__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-application.desktop', indicator_application_autostart) - - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-datetime/indicator-dateime-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-datetime/indicator-datetime-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_datetime_autostart = __INDICATOR_DATETIME__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-datetime.desktop', indicator_datetime_autostart) - - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-sound/indicator-sound-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-sound/indicator-sound-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_sound_autostart = __INDICATOR_SOUND__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-sound.desktop', indicator_sound_autostart) - - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-messages/indicator-messages-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-messages/indicator-messages-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_messages_autostart = __INDICATOR_MESSAGES__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-messages.desktop', indicator_messages_autostart) - - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-power/indicator-power-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-power/indicator-power-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_power_autostart = __INDICATOR_POWER__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-power.desktop', indicator_power_autostart) - - if os.path.exists('/usr/lib/' + self.multiarch + '/indicator-session/indicator-session-service'): - pid = subprocess.Popen(['/usr/lib/' + self.multiarch + '/indicator-session/indicator-session-service'], stdout=DEVNULL, stderr=DEVNULL).pid - indicator_session_autostart = __INDICATOR_SESSION__.replace('MULTIARCH', self.multiarch) - self.create_autostart('indicator-session.desktop', indicator_session_autostart) - def toggle_desktop_icons_sensitiveness(self): sensitiveness = self.builder.get_object("checkbox_show_icons").get_active() self.builder.get_object("caption_desktop_icons").set_sensitive(sensitiveness) @@ -698,7 +586,7 @@ if len(settings.keys()) > 0 and len(target_keys) > 0: section_keys = set(settings.keys()) ignore_keys = list(section_keys - set(target_keys)) - + for key in ignore_keys: del settings[key] @@ -716,7 +604,7 @@ try: with open(os.path.join('/','usr','share','mate-panel','layouts', panel_layout + '.layout'), 'rb', 0) as layout, \ mmap.mmap(layout.fileno(), 0, access=mmap.ACCESS_READ) as data: - + section_pos = data.find(section.encode('utf-8')) if section_pos != -1: data.seek(section_pos) @@ -726,12 +614,12 @@ while not done: line = data.readline().strip().decode('utf-8') done = (not line or line.isspace()) - + if not done: if line.find("=") > 0: setting = line.split("=", 1) settings[setting[0]] = setting[1] - + except: print("ERROR!! Reading file %s" % panel_layout + '.layout', sys.exc_info()[0]) @@ -745,7 +633,7 @@ for tag in name_tags: if panel_layout.startswith(tag): return True - + return False @@ -780,7 +668,7 @@ label.set_use_markup(True) box = dialog.get_content_area() - box.set_border_width(8) + box.set_border_width(12) box.add(label) dialog.show_all() @@ -794,7 +682,6 @@ return confirmed def replace_panel_layout(self, new_layout, called_from_api=False): - kill_brisk = False leds_enabled = self.get_bool('org.mate.peripherals-keyboard-xkb.general', None, 'duplicate-leds') icon_size = self.get_string('org.mate.panel.menubar', None, 'icon-size') item_icon_size = self.get_string('org.mate.panel.menubar', None, 'item-icon-size') @@ -804,13 +691,13 @@ if not called_from_api: self.update_panel_layout_ui(new_layout) - # Change Brisk Menu label-visible state when changing to/from Cupertino, Mutiny and Netbook. + # Change Brisk Menu label-visible state when changing to/from Cupertino and Netbook. if self.brisk_menu_available: label_visible = self.get_bool('com.solus-project.brisk-menu', None, 'label-visible') - if (new_layout.startswith('eleven') or new_layout.startswith('mutiny') or new_layout.startswith('netbook')): + if (new_layout.startswith('eleven') or new_layout.startswith('netbook')): self.set_bool('com.solus-project.brisk-menu', None, 'label-visible', False) - # If we're switching from Cupertino, Mutiny or Netbook and Brisk Menu label-visible is disabled then enable it. - elif (self.current_layout.startswith('eleven') or self.current_layout.startswith('mutiny') or self.current_layout.startswith('netbook')) and not label_visible: + # If we're switching from Cupertino or Netbook and Brisk Menu label-visible is disabled then enable it. + elif (self.current_layout.startswith('eleven') or self.current_layout.startswith('netbook')) and not label_visible: self.set_bool('com.solus-project.brisk-menu', None, 'label-visible', True) # Change Brisk Menu window-type when changing to/from Mutiny or Cupertino. @@ -819,17 +706,15 @@ # If we're switching to Mutiny or Cupertino, and Brisk Menu change the window-type to dash. # FIXME! Do not hardcode this. self.set_enum('com.solus-project.brisk-menu', None, 'window-type', 2) - kill_brisk = True elif self.current_layout.startswith('mutiny') or self.current_layout.startswith('eleven'): - # If we're switching from Mutiny, and Brisk Menu change the window-type to classic. + # If we're switching from Mutiny or Cupertino, and Brisk Menu change the window-type to classic. # FIXME! Do not hardcode this. self.set_enum('com.solus-project.brisk-menu', None, 'window-type', 1) - kill_brisk = True - # If we're switching to Cupertino or Mutiny to move window + # If we're switching to Cupertino move window # controls to the left and enable Global Menu. # If there is a custom setting, use that first - layout_name_is_special = self.is_panel_layout_name_special(new_layout, ['eleven','mutiny','contemporary']) + layout_name_is_special = self.is_panel_layout_name_special(new_layout, ['eleven','contemporary']) custom_settings = self.get_panel_layout_section_settings(new_layout, 'Customsetting windowcontrollayout', \ ['mate-general','mate-interface','gnome-wm-preferences']) @@ -879,20 +764,9 @@ # indicators and applets need to be stopped/started if self.panel_layout_uses('IndicatorApplet', new_layout): self.disable_applets() - self.enable_indicators() else: - self.disable_indicators() self.enable_applets() - # Brisk Menu remains running. - # So if Brisk is in the layout being switched away from, kill it. - if not self.panel_layout_uses('BriskMenu', self.current_layout) and \ - self.process_running('brisk-menu'): - kill_brisk = True - - if kill_brisk: - self.kill_process('brisk-menu') - # If we have a custom panel layout just replace the dconf dump. if os.path.exists(os.path.join('/','usr','share','mate-panel','layouts', new_layout + '.panel')): print('Loading additional panel configuration for ' + new_layout) @@ -902,15 +776,44 @@ # Determine if the dock should be enabled if os.path.exists(os.path.join('/','usr','share','mate-panel','layouts', new_layout + '.dock')) and self.dock is not None: print('Found dock hint for ' + new_layout) + mate_theme = self.get_string('org.mate.interface', None, 'gtk-theme') + if not new_layout.startswith('mutiny'): + self.set_dconf_value('/net/launchpad/plank/docks/dock1/alignment', "'center'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/hide-mode', "'window-dodge'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/icon-size', "'48'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/items-alignment', "'center'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/position', "'bottom'") + if mate_theme == 'Yaru-MATE-dark': + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Yaru-dark'") + elif mate_theme == 'Yaru-MATE-light': + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Yaru-light'") + elif mate_theme in ['Ambiant-MATE', 'Ambiant-MATE-Dark', 'Radiant-MATE']: + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Ubuntu-MATE'") + else: + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Default'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/zoom-enabled', "true") + elif new_layout.startswith('mutiny'): + self.set_dconf_value('/net/launchpad/plank/docks/dock1/alignment', "'fill'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/hide-mode', "'none'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/icon-size', "'56'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/items-alignment', "'start'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/position', "'left'") + if mate_theme == 'Yaru-MATE-dark': + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Mutiny-dark'") + elif mate_theme == 'Yaru-MATE-light': + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Mutiny-light'") + else: + self.set_dconf_value('/net/launchpad/plank/docks/dock1/theme', "'Matte'") + self.set_dconf_value('/net/launchpad/plank/docks/dock1/zoom-enabled', "false") self.enable_dock() else: self.disable_dock() # Determine if maximised windows should be undecorated if self.maximus_available: - layout_name_is_special = self.is_panel_layout_name_special(new_layout, ['mutiny','netbook']) + layout_name_is_special = self.is_panel_layout_name_special(new_layout, ['netbook']) custom_settings = self.get_panel_layout_section_settings(new_layout, 'Customsetting maximusdecoration', []) - + # Prefer custom settings if custom_settings.get('mate-maximus-undecorate') and custom_settings.get('mate-maximus-undecorate').upper() == 'TRUE': self.maximus_undecorate() @@ -924,6 +827,11 @@ # Set the new layout subprocess.call(['mate-panel', '--reset', '--layout', new_layout], stdout=DEVNULL, stderr=DEVNULL) + # Brisk Menu remains running. + # So if Brisk is not in the layout being switched to, kill it. + if not self.panel_layout_uses('BriskMenu', new_layout) and self.process_running('brisk-menu'): + self.kill_process('brisk-menu') + # Update the Dock checkbutton UI if not called_from_api: self.builder.get_object("checkbutton_dock").set_active(self.dock_enabled) @@ -1159,15 +1067,8 @@ self.brisk_menu_available = False self.appmenu_applet_available = False - if os.path.exists('/usr/lib/indicators3/7/libapplication.so') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-application/indicator-application-service') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-datetime/indicator-datetime-service') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-sound/indicator-sound-service') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-messages/indicator-messages-service') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-power/indicator-power-service') and \ - os.path.exists('/usr/lib/' + self.multiarch + '/indicator-session/indicator-session-service') and \ - (os.path.exists('/usr/share/mate-panel/applets/org.ayatana.panel.IndicatorApplet.mate-panel-applet') or \ - os.path.exists('/usr/share/mate-panel/applets/org.mate.applets.IndicatorAppmenu.mate-panel-applet')): + if os.path.exists('/usr/lib/ayatana-indicators3/7/libayatana-application.so') and \ + os.path.exists('/usr/share/mate-panel/applets/org.mate.applets.Indicator.mate-panel-applet'): self.indicators_available = True if os.path.exists('/usr/share/applications/mageia-drakconf.desktop'): @@ -1281,13 +1182,13 @@ # Prefer Indicator enabled Mutiny layout and fallback to non-Indicator version. if self.panel_layout_exists('mutiny') and \ - self.mate_dock_available and \ + self.dock is not None and \ self.appmenu_applet_available and \ self.indicators_available and \ self.brisk_menu_available: self.add_to_panel_list(panels, "Mutiny", "mutiny") elif self.panel_layout_exists('mutiny-no-indicators') and \ - self.mate_dock_available and \ + self.dock is not None and \ self.appmenu_applet_available and \ not self.indicators_available: self.add_to_panel_list(panels, "Mutiny", "mutiny-no-indicators") @@ -1296,8 +1197,7 @@ if self.panel_layout_exists('netbook') and \ self.maximus_available and \ self.indicators_available and \ - self.brisk_menu_available and \ - self.mate_dock_available: + self.brisk_menu_available: self.add_to_panel_list(panels, "Netbook", "netbook") elif self.panel_layout_exists('netbook-no-indicators') and \ self.maximus_available and \ @@ -1317,10 +1217,10 @@ # Prefer Indicator enabled Redmond layout and fallback to non-Indicator version. if self.panel_layout_exists('redmond') and \ self.indicators_available and \ - self.mate_menu_available: + self.brisk_menu_available: self.add_to_panel_list(panels, "Redmond", "redmond") elif self.panel_layout_exists('redmond-no-indicators') and \ - self.mate_menu_available and \ + self.brisk_menu_available and \ not self.indicators_available: self.add_to_panel_list(panels, "Redmond", "redmond-no-indicators") @@ -1358,7 +1258,7 @@ if custom_layout_prefix != '': layout_display_name = layout_code_name.replace(custom_layout_prefix, '', 1) - layout_display_name = layout_display_name.replace('-tweak', '') + layout_display_name = layout_display_name.replace('-tweak', '') result = {'displayname': _('Custom: ') + layout_display_name, 'codename': layout_code_name} @@ -1371,7 +1271,7 @@ for layout_template in self.system_installed_panel_layouts: if self.is_panel_layout_name_special(layout_code_name, [layout_template]): result = layout_template + '--' - + return result def ask_for_layout_name(self): @@ -1650,7 +1550,7 @@ self.builder.get_object("checkbutton_dock").set_label(_("Enable Dock")) self.builder.get_object("checkbutton_dock").set_tooltip_text(_("When checked the Dock will be enabled.")) self.builder.get_object("checkbutton_hud").set_label(_("Enable HUD")) - self.builder.get_object("checkbutton_hud").set_tooltip_text(_("When checked the Heads-Up Display (HUD) will be enabled. Press Alt_L to search application menus.")) + self.builder.get_object("checkbutton_hud").set_tooltip_text(_("When checked the Heads-Up Display (HUD) will be enabled. Press the configured key (defaults to Left Alt) to search application menus.")) self.builder.get_object("checkbutton_show_applications").set_label(_("Show Applications")) self.builder.get_object("checkbutton_show_applications").set_tooltip_text(_("Show Applications item in the menu bar")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-tweak-20.04.0/util/mate-tweak-helper new/mate-tweak-21.04.3/util/mate-tweak-helper --- old/mate-tweak-20.04.0/util/mate-tweak-helper 2020-02-13 23:23:42.000000000 +0100 +++ new/mate-tweak-21.04.3/util/mate-tweak-helper 2021-03-04 11:27:47.000000000 +0100 @@ -57,10 +57,10 @@ def backup_layout(filename): - VALID = {'toplevel': ('expand', 'size', 'orientation'), + VALID = {'toplevel': ('enable-buttons', 'expand', 'monitor', 'orientation', 'screen', 'size'), 'launcher': ('object-type', 'launcher-location', 'menu-path', 'toplevel-id', 'position', 'panel-right-stick', 'locked'), 'applet': ('object-type', 'applet-iid', 'toplevel-id', 'position', 'panel-right-stick', 'locked'), - 'drawer': ('object-type', 'attached-toplevel-id', 'toplvel-id', 'position', 'panel-right-stick', 'use-custom-icon'), + 'drawer': ('object-type', 'attached-toplevel-id', 'toplevel-id', 'position', 'panel-right-stick', 'use-custom-icon'), 'menu-bar': ('object-type', 'applet-iid', 'toplevel-id', 'position', 'panel-right-stick', 'locked'), 'menu': ('object-type', 'toplevel-id', 'position', 'panel-right-stick', 'locked'), 'action': ('object-type', 'action-type', 'position', 'toplevel-id', 'panel-right-stick', 'locked'), @@ -103,13 +103,7 @@ obj_toplevel = settings['toplevel-id'] obj_type = settings['object-type'] - obj_name = "" - if obj_type == "applet": - obj_name = settings['applet-iid'].split(":")[-1] - elif obj_type == "action": - obj_name = settings['action-type'] - else: - obj_name = obj_type + obj_name = str(obj) if not obj_toplevel in toplevel_ids: print("WARNING! object \"%s\" references unknown toplevel... skipped" % obj_name) @@ -125,7 +119,7 @@ layout.append("%s=%s\n" % (key, val)) layout.append("\n") - layout.extend(get_non_panel_settings()) + layout.extend(get_non_panel_settings()) #print(layout) with open(os.path.join(tempfile.gettempdir(), filename + '.layout'), 'w') as f:
