Hello community, here is the log from the commit of package mate-tweak for openSUSE:Factory checked in at 2016-03-07 13:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-tweak (Old) and /work/SRC/openSUSE:Factory/.mate-tweak.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-tweak" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-tweak/mate-tweak.changes 2016-02-23 16:59:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-tweak.new/mate-tweak.changes 2016-03-07 13:28:36.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 4 07:46:25 UTC 2016 - [email protected] + +- Update to 3.5.7: + * Fix checking available features. + * Make window snapping option inactive when reduced resources is + enabled (lp#1548001). + * Support Synapse. +- Add runtime dependencies to BuildRequires to ensure they are + available on the target. + +------------------------------------------------------------------- Old: ---- mate-tweak-3.5.6.tar.gz New: ---- mate-tweak-3.5.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-tweak.spec ++++++ --- /var/tmp/diff_new_pack.jNRrsP/_old 2016-03-07 13:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.jNRrsP/_new 2016-03-07 13:28:37.000000000 +0100 @@ -17,9 +17,9 @@ %define _name mate_tweak -%define _rev 07a4ec972291 +%define _rev db3f8d05fdb0 Name: mate-tweak -Version: 3.5.6 +Version: 3.5.7 Release: 0 Summary: MATE desktop tweak tool License: GPL-2.0+ @@ -28,11 +28,16 @@ Source: https://bitbucket.org/ubuntu-mate/%{name}/get/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE mate-tweak-use-matemenu.patch [email protected] -- Layouts are patched to use mate-menu instead of mintMenu or gnome-main-menu. Patch0: %{name}-use-matemenu.patch +BuildRequires: Mesa-demo-x +BuildRequires: dconf BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python3 +BuildRequires: python3-configobj BuildRequires: python3-distutils-extra +BuildRequires: python3-gobject +BuildRequires: python3-psutil BuildRequires: python3-setuptools BuildRequires: update-desktop-files Requires: Mesa-demo-x ++++++ mate-tweak-3.5.6.tar.gz -> mate-tweak-3.5.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-07a4ec972291/data/mate-tweak.ui new/ubuntu-mate-mate-tweak-db3f8d05fdb0/data/mate-tweak.ui --- old/ubuntu-mate-mate-tweak-07a4ec972291/data/mate-tweak.ui 2016-02-21 03:30:04.000000000 +0100 +++ new/ubuntu-mate-mate-tweak-db3f8d05fdb0/data/mate-tweak.ui 2016-03-02 15:04:36.000000000 +0100 @@ -450,7 +450,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> @@ -471,7 +471,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">3</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -489,7 +489,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> </object> @@ -638,7 +638,7 @@ <property name="receives_default">False</property> <property name="halign">start</property> <property name="valign">center</property> - <property name="xalign">0.5</property> + <property name="xalign">0.44999998807907104</property> <property name="draw_indicator">True</property> </object> <packing> @@ -665,6 +665,21 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="checkbutton_launcher"> + <property name="label" translatable="yes">Enable launcher</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="checkbutton_keyboard_led"> <property name="label" translatable="yes">Enable keyboard LED</property> <property name="visible">True</property> @@ -676,7 +691,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-07a4ec972291/mate-tweak new/ubuntu-mate-mate-tweak-db3f8d05fdb0/mate-tweak --- old/ubuntu-mate-mate-tweak-07a4ec972291/mate-tweak 2016-02-21 03:30:04.000000000 +0100 +++ new/ubuntu-mate-mate-tweak-db3f8d05fdb0/mate-tweak 2016-03-02 15:04:36.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (C) 2007-2014 by Clement Lefebvre <[email protected]> -# Copyright (C) 2015 Martin Wimpress <[email protected]> +# Copyright (C) 2015-2016 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 @@ -56,7 +56,16 @@ # Workaround introspection bug, gnome bug 622084 signal.signal(signal.SIGINT, signal.SIG_DFL) -__VERSION__ = '3.5.6' +__VERSION__ = '3.5.7' + +__SYNAPSE__ = """[Desktop Entry] +Name=Synapse +Exec=synapse --startup +Encoding=UTF-8 +Type=Application +X-GNOME-Autostart-enabled=true +X-MATE-Autostart-enabled=true +Icon=synapse""" # i18n gettext.install('mate-tweak', os.path.join('/','usr','share','locale')) @@ -85,7 +94,7 @@ class MateTweak: def on_checkbox_toggled(self, widget, schema_id, key): - # If Maximus is being tweaked, replace it to make the settings effective. + # If Maximus is bt_booleing tweaked, replace it to make the settings effective. if schema_id == "org.mate.maximus" and (key == "undecorate" or key == "no-maximize"): subprocess.Popen(['mate-maximus', '--replace'], stdout=DEVNULL, stderr=DEVNULL) @@ -94,6 +103,16 @@ if key == 'undecorate': self.replace_windowmanager(self.current_wm, False) + elif (key == "reduced-resources"): + if ('marco' in self.current_wm): + marco_reduced = self.get_bool('org.mate.Marco.general', None, key) + self.set_bool('org.mate.Marco.general', None, 'side-by-side-tiling', marco_reduced) + self.builder.get_object('checkbox_snapping').props.sensitive = marco_reduced + elif ('metacity' in self.current_wm): + metacity_reduced = self.get_bool('org.gnome.metacity', None, key) + self.set_bool('org.gnome.metacity', None, 'edge-tiling', metacity_reduced) + self.builder.get_object('checkbox_snapping').props.sensitive = metacity_reduced + def set_string(self, schema, path, key, value): if path: settings = Gio.Settings.new_with_path(schema, path) @@ -377,6 +396,32 @@ self.kill_process(self.dock) self.dock_enabled = False + def enable_launcher(self): + config_dir = GLib.get_user_config_dir() + if self.launcher == 'synapse': + synapse_autostart = __SYNAPSE__ + + self.mkdir_p(os.path.join(config_dir, 'autostart/')) + if not os.path.exists(os.path.join(config_dir, 'autostart/') + self.launcher + '.desktop'): + with open(os.path.join(config_dir, 'autostart/') + self.launcher + '.desktop','w') as autostart: + autostart.write(synapse_autostart) + + # Launch synapse, if it is not already enabled. + if not self.launcher_enabled: + subprocess.Popen([self.launcher, '--startup'], stdout=DEVNULL, stderr=DEVNULL) + self.launcher_enabled = True + + def disable_launcher(self): + config_dir = GLib.get_user_config_dir() + if self.launcher == 'synapse': + if os.path.exists(os.path.join(config_dir, 'autostart/') + self.launcher + '.desktop'): + os.remove(os.path.join(config_dir, 'autostart/') + self.launcher + '.desktop') + + if self.process_running(self.launcher): + self.kill_process(self.launcher) + + self.launcher_enabled = False + def enable_mate_volume_applet(self): subprocess.Popen(['mate-volume-control-applet'], stdout=DEVNULL, stderr=DEVNULL) @@ -409,8 +454,14 @@ if self.panel_layout_exists(panel_layout + '-fresh') and \ self.panel_layout_exists(panel_layout + '-indicators') and \ self.panel_layout_exists(panel_layout + '-indicators-fresh'): - self.builder.get_object('checkbutton_indicators').props.sensitive = True - self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True + if not self.indicators_available: + self.builder.get_object('checkbutton_indicators').props.sensitive = False + else: + self.builder.get_object('checkbutton_indicators').props.sensitive = True + if not self.mate_menu_available: + self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False + else: + self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True else: self.builder.get_object('checkbutton_indicators').props.sensitive = False self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False @@ -457,7 +508,8 @@ thumbnail_profile_path = '/org/compiz/profiles/mate/plugins/thumbnail/' # Determine if the dock should be enabled - if new_layout.startswith('eleven') and self.dock is not None: + if (new_layout.startswith('eleven') and self.dock is not None) or \ + (new_layout.startswith('wimpy') and self.dock is not None): if 'compiz' in self.current_wm: # https://bugs.launchpad.net/ubuntu-mate/+bug/1437611 self.set_bool(thumbnail_schema_id, thumbnail_profile_path, 'current-viewport', False) @@ -508,6 +560,12 @@ self.get_panel_layout() self.replace_panel_layout(self.base_layout) + def toggle_launcher(self, checkbutton): + if checkbutton.get_active(): + self.enable_launcher() + else: + self.disable_launcher() + def panel_layout_exists(self, panel_layout): return os.path.exists('/usr/share/mate-panel/layouts/' + panel_layout + '.layout') @@ -528,7 +586,7 @@ self.software_rasterizer = False self.texture_from_pixmap = False - def additional_tweaks(self, schema, key, value): + def additional_tweaks(self, schema, key, value): if schema == "org.mate.Marco.general" and key == "button-layout": # If the button-layout is changed in MATE reflect that change # for GTK3 and GNOME. @@ -599,8 +657,6 @@ self.builder.get_object("main_notebook").set_current_page(target) def check_dock_features(self): - config_dir = GLib.get_user_config_dir() - # Order matters. Plank is preferred. if self.find_on_path('plank') and \ os.path.exists(os.path.join('/','usr','share','applications', 'plank.desktop')): @@ -616,6 +672,20 @@ else: self.dock_enabled = False + def check_launcher_features(self): + config_dir = GLib.get_user_config_dir() + + if self.find_on_path('synapse') and \ + os.path.exists(os.path.join('/','usr','share','applications', 'synapse.desktop')): + self.launcher = 'synapse' + else: + self.launcher = None + + if self.launcher is not None and os.path.exists(os.path.join(config_dir, 'autostart/') + self.launcher + '.desktop'): + self.launcher_enabled = True + else: + self.launcher_enabled = False + def check_panel_features(self): # Determine what panel features are available self.gnome_menu_available = False @@ -664,15 +734,6 @@ def make_list_of_panel_layouts(self): - if not self.indicators_available: - self.builder.get_object('checkbutton_indicators').props.sensitive = False - else: - self.builder.get_object('checkbutton_indicators').props.sensitive = True - if not self.mate_menu_available: - self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False - else: - self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True - # Panel layouts panels = Gtk.ListStore(str, str) @@ -715,6 +776,9 @@ if self.panel_layout_exists('ubuntu-mate'): panels.append([_("Ubuntu MATE"), "ubuntu-mate"]) + if self.panel_layout_exists('wimpy'): + panels.append([_("Wimpy"), "wimpy"]) + self.builder.get_object("combobox_panels").set_model(panels) def save_panels(self, widget): @@ -748,6 +812,7 @@ # Check for glx, panel, dock and wm features self.check_glx_features() self.check_dock_features() + self.check_launcher_features() self.check_panel_features() self.check_wm_features() @@ -841,6 +906,7 @@ self.builder.get_object("checkbutton_indicators").set_label(_("Enable indicators")) self.builder.get_object("checkbutton_advanced_menu").set_label(_("Enable advanced menu")) self.builder.get_object("checkbutton_keyboard_led").set_label(_("Enable keyboard LED")) + self.builder.get_object("checkbutton_launcher").set_label(_("Enable launcher")) self.builder.get_object("checkbutton_menuicon").set_label(_("Show icons on menus")) self.builder.get_object("checkbutton_button_icons").set_label(_("Show icons on buttons")) self.builder.get_object("checkbutton_im_menu").set_label(_("Show Input Methods menu in context menus")) @@ -868,6 +934,17 @@ elif self.current_wm == "mutter": self.init_checkbox('org.gnome.mutter', 'edge-tiling', 'checkbox_snapping') + # Make the Window Snapping checkbox inactive based if reduced resources is enabled + # - https://bugs.launchpad.net/ubuntu-mate/+bug/1548011 + if ('marco' in self.current_wm): + marco_reduced = self.get_bool('org.mate.Marco.general', None, 'reduced-resources') + if marco_reduced: + self.builder.get_object('checkbox_snapping').props.sensitive = False + elif ('metacity' in self.current_wm): + metacity_reduced = self.get_bool('org.gnome.metacity', None, 'reduced-resources') + if metacity_reduced: + self.builder.get_object('checkbox_snapping').props.sensitive = False + # interface page self.init_checkbox("org.mate.interface", "menus-have-icons", "checkbutton_menuicon") self.init_checkbox("org.mate.interface", "show-input-method-menu","checkbutton_im_menu") @@ -920,6 +997,12 @@ self.builder.get_object("checkbutton_indicators").connect("toggled", self.toggle_panel_features) self.builder.get_object("checkbutton_advanced_menu").connect("toggled", self.toggle_panel_features) + # Launcher + self.builder.get_object("checkbutton_launcher").connect("toggled", self.toggle_launcher) + self.builder.get_object("checkbutton_launcher").set_active(self.launcher_enabled) + if not self.launcher: + self.builder.get_object('checkbutton_launcher').props.sensitive = False + # toolbar icon styles iconStyles = Gtk.ListStore(str, str) iconStyles.append([_("Text below items"), "both"])
