Hello community,
here is the log from the commit of package mate-control-center for
openSUSE:Factory checked in at 2018-04-20 17:26:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-control-center (Old)
and /work/SRC/openSUSE:Factory/.mate-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-control-center"
Fri Apr 20 17:26:48 2018 rev:20 rq:595717 version:1.20.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-control-center/mate-control-center.changes
2018-03-20 21:58:55.500782092 +0100
+++
/work/SRC/openSUSE:Factory/.mate-control-center.new/mate-control-center.changes
2018-04-20 17:26:55.392080506 +0200
@@ -1,0 +2,9 @@
+Wed Apr 11 10:12:43 UTC 2018 - [email protected]
+
+- Update to version 1.20.2:
+ * Add auto-detect toggle switch for font DPI.
+ * Fix screen geometry when snapping windows on rotated displays.
+ * Fix segfaults in theme installers.
+ * Scale cursor size for HiDPI when changing themes.
+
+-------------------------------------------------------------------
Old:
----
mate-control-center-1.20.0.tar.xz
New:
----
mate-control-center-1.20.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-control-center.spec ++++++
--- /var/tmp/diff_new_pack.KoZCSp/_old 2018-04-20 17:26:55.940060635 +0200
+++ /var/tmp/diff_new_pack.KoZCSp/_new 2018-04-20 17:26:55.940060635 +0200
@@ -22,7 +22,7 @@
%define sover_slab 0
%define _version 1.20
Name: mate-control-center
-Version: 1.20.0
+Version: 1.20.2
Release: 0
Summary: MATE Desktop control center
License: GPL-2.0-or-later
++++++ mate-control-center-1.20.0.tar.xz -> mate-control-center-1.20.2.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-control-center-1.20.0/ChangeLog
new/mate-control-center-1.20.2/ChangeLog
--- old/mate-control-center-1.20.0/ChangeLog 2018-02-06 17:54:30.000000000
+0100
+++ new/mate-control-center-1.20.2/ChangeLog 2018-03-27 14:17:36.000000000
+0200
@@ -1,3 +1,147 @@
+commit f031ccbb44a3623439a8717695f84f11472b609c
+Author: raveit65 <[email protected]>
+Date: Tue Mar 27 14:15:26 2018 +0200
+
+ release 1.20.2
+
+ NEWS | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit c0265297e0de939851c1711546a537251de44624
+Author: Victor Kareh <[email protected]>
+Date: Sat Mar 24 00:45:02 2018 -0400
+
+ Scale cursor size for HiDPI when changing themes
+
+ capplets/common/mate-theme-info.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6e38885da48696ec37e71a98d5c5863d014beff1
+Author: Martin Wimpress <[email protected]>
+Date: Mon Mar 26 21:57:15 2018 +0100
+
+ Bump version to 1.20.1
+
+ NEWS | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+commit cf3344fdde4055ff37805bb65cf908e431f4bd44
+Author: raveit65 <[email protected]>
+Date: Fri Mar 23 18:31:12 2018 +0100
+
+ tx: update resource file
+
+ mate-control-center.pot | 230 +++++++++++++++++++++++++-----------------------
+ 1 file changed, 119 insertions(+), 111 deletions(-)
+
+commit 6d4493b2999055e7451c5cea9a3f9b8023b0552c
+Author: Victor Kareh <[email protected]>
+Date: Thu Mar 15 14:53:50 2018 -0400
+
+ Add auto-detect toggle switch
+
+ Currently if a user changes the DPI, there is no way to reset it back to
+ the auto-detected value from Xserver (which we store as 0 in gsettings).
+ Adding this toggle solves that issue.
+
+ I also removed a deprecated
+ [GtkHandleBox](https://developer.gnome.org/gtk3/stable/GtkHandleBox.html)
+ and all its associated code.
+
+ capplets/appearance/appearance-font.c | 74 ++++++++---
+ capplets/appearance/appearance-ui.c | 48 -------
+ capplets/appearance/appearance.h | 1 -
+ capplets/appearance/data/appearance.ui | 221 +++++++++++++++++++++------------
+ 4 files changed, 202 insertions(+), 142 deletions(-)
+
+commit 422530834108da01b74979b192f6c1b713d66e0e
+Author: Zhang Xianwei <[email protected]>
+Date: Sun Feb 11 17:16:22 2018 +0800
+
+ Remove useless parameter in mate_theme_install_real
+
+ filetype is not used in mate_theme_install_real, remove it.
+
+ Signed-off-by: Zhang Xianwei <[email protected]>
+
+ capplets/appearance/theme-installer.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit 9100c01c1a61521c599ccc032a2c9b4d39662ae4
+Author: raveit65 <[email protected]>
+Date: Fri Mar 23 12:47:48 2018 +0100
+
+ tx: update config with branch specific resoures
+
+ .tx/config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit da864825f4b89e666bd41cf5d4a118d1377b4f11
+Author: Brent Bradburn <[email protected]>
+Date: Sat Feb 24 14:57:52 2018 -0700
+
+ Fix screen geometry to account for rotation when snapping.
+
+ capplets/display/xrandr-capplet.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 4c498854d5933a72b741d0ed76df0fa79beab881
+Author: raveit65 <[email protected]>
+Date: Fri Mar 16 15:22:31 2018 +0100
+
+ tx: add makepot and .pot files
+
+ makepot | 5 +
+ mate-control-center.pot | 2813 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 2818 insertions(+)
+
+commit 7165e06b3ba4fc9abf7508d4f599a4ea744afdf8
+Author: Zhang Xianwei <[email protected]>
+Date: Mon Jan 15 18:56:00 2018 +0800
+
+ theme-util.c: fix segfault on attempt to delete custom theme
+
+ fixes https://github.com/mate-desktop/mate-control-center/issues/334
+
+ Signed-off-by: Zhang Xianwei <[email protected]>
+
+ capplets/appearance/theme-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 8adccf37fe94b15cc3c44591ec5f89ce8448f2b8
+Author: Zhang Xianwei <[email protected]>
+Date: Wed Jan 24 16:49:59 2018 +0800
+
+ theme-installer.c: add tips when reinstall a existed theme
+
+ When ~/.themes/theme-name is existed, reinstalling the same theme will
+ be failed. Add tips when reinstall a existed theme to fix it.
+
+ Signed-off-by: Zhang Xianwei <[email protected]>
+
+ capplets/appearance/theme-installer.c | 51 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+
+commit 598b1878627ddbf2484706c6afd4aa5d05976660
+Author: raveit65 <[email protected]>
+Date: Sun Mar 11 12:44:01 2018 +0100
+
+ transifex: set minimum_perc = 1
+
+ .tx/config | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 61cde4b8f24b42734211234330019e1c671c4ef1
+Author: raveit65 <[email protected]>
+Date: Sun Mar 11 11:45:27 2018 +0100
+
+ transifex: add type PO to client config file
+
+ .tx/config | 1 +
+ 1 file changed, 1 insertion(+)
+
commit 8c9afd8e997ea80e7aa5862159f481ff5433b74c
Author: raveit65 <[email protected]>
Date: Tue Feb 6 17:52:53 2018 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-control-center-1.20.0/NEWS
new/mate-control-center-1.20.2/NEWS
--- old/mate-control-center-1.20.0/NEWS 2018-02-06 17:52:06.000000000 +0100
+++ new/mate-control-center-1.20.2/NEWS 2018-03-27 14:15:08.000000000 +0200
@@ -1,3 +1,13 @@
+### mate-control-center 1.20.2
+
+ * Scale cursor size for HiDPI when changing themes
+
+### mate-control-center 1.20.1
+
+ * Add auto-detect toggle switch for font DPI.
+ * Fix screen geometry when snapping windows on rotated displays.
+ * Fix segfaults in theme installers.
+
### mate-control-center 1.20.0
* Scale font DPI for HiDPI displays
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/appearance-font.c
new/mate-control-center-1.20.2/capplets/appearance/appearance-font.c
--- old/mate-control-center-1.20.0/capplets/appearance/appearance-font.c
2018-02-06 17:47:43.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/appearance-font.c
2018-03-23 18:15:58.000000000 +0100
@@ -473,11 +473,22 @@
}
static void
-dpi_changed (GSettings *settings,
- gchar *key,
- gpointer user_data)
+dpi_changed (GSettings *settings,
+ gchar *key,
+ AppearanceData *data)
{
- dpi_load (settings, user_data);
+ GtkWidget *spinner;
+ GtkWidget *toggle;
+ gdouble dpi;
+
+ dpi = g_settings_get_double (data->font_settings, FONT_DPI_KEY);
+ spinner = appearance_capplet_get_widget (data, "dpi_spinner");
+ toggle = appearance_capplet_get_widget (data, "dpi_reset_switch");
+
+ dpi_load (settings, GTK_SPIN_BUTTON (spinner));
+
+ gtk_switch_set_state (GTK_SWITCH (toggle), dpi == 0);
+ gtk_widget_set_sensitive (spinner, dpi != 0);
}
static void
@@ -490,8 +501,8 @@
}
static void
-dpi_value_changed (GtkSpinButton *spinner,
- GSettings *settings)
+dpi_value_changed (GtkSpinButton *spinner,
+ AppearanceData *data)
{
/* Like any time when using a spin button with GSettings, there is
* a race condition here. When we change, we send the new
@@ -503,6 +514,7 @@
*/
if (!in_change) {
GdkScreen *screen;
+ GtkWidget *toggle;
gint scale;
gdouble new_dpi;
@@ -510,12 +522,34 @@
scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
new_dpi = gtk_spin_button_get_value (spinner) / (double)scale;
- g_settings_set_double (settings, FONT_DPI_KEY, new_dpi);
+ g_settings_set_double (data->font_settings, FONT_DPI_KEY, new_dpi);
+
+ dpi_load (data->font_settings, spinner);
- dpi_load (settings, spinner);
+ toggle = appearance_capplet_get_widget (data, "dpi_reset_switch");
+ gtk_switch_set_active (GTK_SWITCH (toggle), FALSE);
}
}
+static gboolean
+dpi_value_reset (GtkSwitch *toggle,
+ gboolean state,
+ AppearanceData *data)
+{
+ GtkWidget *spinner;
+ spinner = appearance_capplet_get_widget (data, "dpi_spinner");
+
+ if (state)
+ g_settings_set_double (data->font_settings, FONT_DPI_KEY, 0);
+ else
+ dpi_value_changed (GTK_SPIN_BUTTON (spinner), data);
+
+ gtk_switch_set_state(toggle, state);
+ gtk_widget_set_sensitive (spinner, !state);
+
+ return TRUE;
+}
+
static void
cb_details_response (GtkDialog *dialog, gint response_id)
{
@@ -532,27 +566,37 @@
{
if (!data->font_details) {
GtkAdjustment *adjustment;
- GtkWidget *widget;
+ GtkWidget *spinner;
+ GtkWidget *toggle;
EnumGroup *group;
+ gdouble dpi;
data->font_details = appearance_capplet_get_widget (data,
"render_details");
gtk_window_set_transient_for (GTK_WINDOW (data->font_details),
GTK_WINDOW (appearance_capplet_get_widget
(data, "appearance_window")));
- widget = appearance_capplet_get_widget (data, "dpi_spinner");
+ spinner = appearance_capplet_get_widget (data, "dpi_spinner");
+ toggle = appearance_capplet_get_widget (data, "dpi_reset_switch");
+
+ /* Set initial state for widgets */
+ dpi = g_settings_get_double (data->font_settings, FONT_DPI_KEY);
+ gtk_switch_set_active (GTK_SWITCH (toggle), dpi == 0);
+ gtk_widget_set_sensitive (GTK_WIDGET (spinner), dpi != 0);
/* pick a sensible maximum dpi */
- adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
+ adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spinner));
gtk_adjustment_set_lower (adjustment, DPI_LOW_REASONABLE_VALUE);
gtk_adjustment_set_upper (adjustment, DPI_HIGH_REASONABLE_VALUE);
gtk_adjustment_set_step_increment (adjustment, 1);
- dpi_load (data->font_settings, GTK_SPIN_BUTTON (widget));
- g_signal_connect (widget, "value_changed",
- G_CALLBACK (dpi_value_changed), data->font_settings);
+ dpi_load (data->font_settings, GTK_SPIN_BUTTON (spinner));
+ g_signal_connect (spinner, "value-changed",
+ G_CALLBACK (dpi_value_changed), data);
+ g_signal_connect (toggle, "state-set",
+ G_CALLBACK (dpi_value_reset), data);
- g_signal_connect (data->font_settings, "changed::" FONT_DPI_KEY,
G_CALLBACK (dpi_changed), widget);
+ g_signal_connect (data->font_settings, "changed::" FONT_DPI_KEY,
G_CALLBACK (dpi_changed), data);
/* Update font DPI when window scaling factor is changed */
g_signal_connect (gdk_screen_get_default (), "monitors-changed",
G_CALLBACK (monitors_changed), data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/appearance-ui.c
new/mate-control-center-1.20.2/capplets/appearance/appearance-ui.c
--- old/mate-control-center-1.20.0/capplets/appearance/appearance-ui.c
2018-01-23 11:05:03.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/appearance-ui.c
2018-03-23 18:15:58.000000000 +0100
@@ -22,34 +22,6 @@
#include "appearance.h"
#include "stdio.h"
-
-static void
-show_handlebar (AppearanceData *data, gboolean show)
-{
- GtkWidget *handlebox = appearance_capplet_get_widget (data,
"toolbar_handlebox");
- GtkWidget *toolbar = appearance_capplet_get_widget (data, "toolbar_toolbar");
- GtkWidget *align = appearance_capplet_get_widget (data, "toolbar_align");
-
- g_object_ref (handlebox);
- g_object_ref (toolbar);
-
- if (gtk_bin_get_child (GTK_BIN (align)))
- gtk_container_remove (GTK_CONTAINER (align), gtk_bin_get_child (GTK_BIN
(align)));
-
- if (gtk_bin_get_child (GTK_BIN (handlebox)))
- gtk_container_remove (GTK_CONTAINER (handlebox), gtk_bin_get_child
(GTK_BIN (handlebox)));
-
- if (show) {
- gtk_container_add (GTK_CONTAINER (align), handlebox);
- gtk_container_add (GTK_CONTAINER (handlebox), toolbar);
- g_object_unref (handlebox);
- } else {
- gtk_container_add (GTK_CONTAINER (align), toolbar);
- }
-
- g_object_unref (toolbar);
-}
-
static void
set_have_icons (AppearanceData *data, gboolean value)
{
@@ -94,14 +66,6 @@
set_have_icons (data, g_settings_get_boolean (settings, key));
}
-static void
-toolbar_detachable_cb (GSettings *settings,
- gchar *key,
- AppearanceData *data)
-{
- show_handlebar (data, g_settings_get_boolean (settings, key));
-}
-
/** GUI Callbacks **/
static gint
@@ -140,16 +104,4 @@
set_have_icons (data,
g_settings_get_boolean (data->interface_settings,
MENU_ICONS_KEY));
-
- g_signal_connect (appearance_capplet_get_widget (data, "toolbar_handlebox"),
- "button_press_event",
- (GCallback) button_press_block_cb, NULL);
-
- show_handlebar (data,
- g_settings_get_boolean (data->interface_settings,
- TOOLBAR_DETACHABLE_KEY));
-
- /* no ui for detachable toolbars */
- g_signal_connect (data->interface_settings,
- "changed::" TOOLBAR_DETACHABLE_KEY, (GCallback)
toolbar_detachable_cb, data);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/appearance.h
new/mate-control-center-1.20.2/capplets/appearance/appearance.h
--- old/mate-control-center-1.20.0/capplets/appearance/appearance.h
2018-02-06 17:46:45.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/appearance.h
2018-03-23 18:15:58.000000000 +0100
@@ -47,7 +47,6 @@
#define COLOR_SCHEME_KEY "gtk-color-scheme"
#define ACCEL_CHANGE_KEY "can-change-accels"
#define MENU_ICONS_KEY "menus-have-icons"
-#define TOOLBAR_DETACHABLE_KEY "toolbar-detachable"
#define TOOLBAR_STYLE_KEY "toolbar-style"
#define GTK_FONT_DEFAULT_VALUE "Sans 10"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/data/appearance.ui
new/mate-control-center-1.20.2/capplets/appearance/data/appearance.ui
--- old/mate-control-center-1.20.0/capplets/appearance/data/appearance.ui
2018-01-23 11:05:03.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/data/appearance.ui
2018-03-23 18:15:58.000000000 +0100
@@ -1,5 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.0
+
+mate-appearance-properties - appearance properties dialog window
+Copyright (C) MATE Developers
+
+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 the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Author: Wolfgang Ulbrich
+
+-->
<interface>
<requires lib="gtk+" version="3.14"/>
<!-- interface-license-type gplv2 -->
@@ -56,23 +77,40 @@
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkBox" id="vbox_resolution">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkBox" id="hbox_resolution">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="halign">start</property>
+ <property name="label"
translatable="yes">R_esolution</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">dpi_spinner</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">R_esolution:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">dpi_spinner</property>
+ <property name="label" translatable="yes">Dots per
inch (DPI):</property>
</object>
<packing>
<property name="expand">False</property>
@@ -81,34 +119,10 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox20">
+ <object class="GtkSpinButton" id="dpi_spinner">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSpinButton" id="dpi_spinner">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">dots per
inch</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -117,11 +131,53 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">This
resets the font DPI to the auto-detected value from Xserver.</property>
+ <property name="label" translatable="yes">Automatic
detection:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="dpi_reset_switch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="active">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -757,6 +813,9 @@
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -769,6 +828,9 @@
<action-widgets>
<action-widget response="-7">button3</action-widget>
</action-widgets>
+ <child>
+ <placeholder/>
+ </child>
</object>
<object class="GtkDialog" id="theme_details">
<property name="can_focus">False</property>
@@ -1553,6 +1615,9 @@
<action-widget response="-11">theme_help_button</action-widget>
<action-widget response="-7">theme_close_button</action-widget>
</action-widgets>
+ <child>
+ <placeholder/>
+ </child>
</object>
<object class="GtkDialog" id="theme_save_dialog">
<property name="can_focus">False</property>
@@ -1724,6 +1789,9 @@
<action-widget response="-6">save_dialog_cancel_button</action-widget>
<action-widget response="-5">save_dialog_save_button</action-widget>
</action-widgets>
+ <child>
+ <placeholder/>
+ </child>
</object>
<object class="GtkListStore" id="toolbar_style_liststore">
<columns>
@@ -3085,53 +3153,47 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHandleBox"
id="toolbar_handlebox">
+ <object class="GtkToolbar"
id="toolbar_toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="toolbar_style">both-horiz</property>
<child>
- <object class="GtkToolbar"
id="toolbar_toolbar">
+ <object class="GtkToolButton"
id="button2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="toolbar_style">both-horiz</property>
- <child>
- <object class="GtkToolButton"
id="button2">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="is_important">True</property>
- <property
name="stock_id">gtk-new</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="button4">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="stock_id">gtk-open</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="save_button">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="stock_id">gtk-save</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <style>
- <class name="primary-toolbar"/>
- </style>
+ <property
name="is_important">True</property>
+ <property
name="stock_id">gtk-new</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="button4">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="stock_id">gtk-open</property>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
</child>
+ <child>
+ <object class="GtkToolButton"
id="save_button">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="stock_id">gtk-save</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <style>
+ <class name="primary-toolbar"/>
+ </style>
</object>
</child>
</object>
@@ -3192,5 +3254,8 @@
<action-widget response="-11">help_button</action-widget>
<action-widget response="-7">close_button</action-widget>
</action-widgets>
+ <child>
+ <placeholder/>
+ </child>
</object>
</interface>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/theme-installer.c
new/mate-control-center-1.20.2/capplets/appearance/theme-installer.c
--- old/mate-control-center-1.20.0/capplets/appearance/theme-installer.c
2018-01-30 20:05:10.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/theme-installer.c
2018-03-27 14:13:19.000000000 +0200
@@ -290,7 +290,6 @@
static gboolean
mate_theme_install_real (GtkWindow *parent,
- gint filetype,
const gchar *tmp_dir,
const gchar *theme_name,
gboolean ask_user)
@@ -370,6 +369,56 @@
theme_source_dir = g_file_new_for_path (tmp_dir);
theme_dest_dir = g_file_new_for_path (target_dir);
+ if (g_file_test (target_dir, G_FILE_TEST_EXISTS)) {
+ gchar *str;
+
+ str = g_strdup_printf (_("The theme \"%s\" is already
existed."), theme_name);
+ dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_NONE,
+ "%s",
+ str);
+ g_free (str);
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG
(dialog),
+ _("Do you want to
install it again?"));
+
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ _("Cancel"),
+ GTK_RESPONSE_CLOSE);
+
+ apply_button = gtk_button_new_with_label (_("Install"));
+ gtk_button_set_image (GTK_BUTTON (apply_button),
+ gtk_image_new_from_icon_name
("gtk-apply",
+
GTK_ICON_SIZE_BUTTON));
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
apply_button, GTK_RESPONSE_APPLY);
+ gtk_widget_set_can_default (apply_button, TRUE);
+ gtk_widget_show (apply_button);
+
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_APPLY);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_APPLY)
{
+ gtk_widget_destroy (dialog);
+
+ if (!capplet_file_delete_recursive (theme_dest_dir,
NULL)) {
+ GtkWidget *info_dialog = gtk_message_dialog_new
(NULL,
+
GTK_DIALOG_MODAL,
+
GTK_MESSAGE_ERROR,
+
GTK_BUTTONS_OK,
+
_("Theme cannot be deleted"));
+ gtk_dialog_run (GTK_DIALOG (info_dialog));
+ gtk_widget_destroy (info_dialog);
+ success = FALSE;
+ goto end;
+ }
+ }else{
+ gtk_widget_destroy (dialog);
+ success = FALSE;
+ goto end;
+ }
+ }
+
if (!g_file_move (theme_source_dir, theme_dest_dir,
G_FILE_COPY_OVERWRITE, NULL, NULL,
NULL, &error)) {
@@ -490,6 +539,7 @@
}
}
+end:
g_free (target_dir);
g_object_unref (theme_source_dir);
g_object_unref (theme_dest_dir);
@@ -525,7 +575,6 @@
if (filetype == DIRECTORY) {
gchar *name = g_path_get_basename (path);
mate_theme_install_real (parent,
- filetype,
path,
name,
TRUE);
@@ -597,7 +646,6 @@
if (g_file_test (theme_dir, G_FILE_TEST_IS_DIR))
ok = mate_theme_install_real (parent,
- filetype,
theme_dir,
name,
n_themes == 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/appearance/theme-util.c
new/mate-control-center-1.20.2/capplets/appearance/theme-util.c
--- old/mate-control-center-1.20.0/capplets/appearance/theme-util.c
2018-01-30 20:05:10.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/appearance/theme-util.c
2018-03-27 14:13:19.000000000 +0200
@@ -99,8 +99,8 @@
break;
case THEME_TYPE_META:
- theme = (MateThemeCommonInfo *) mate_theme_info_find (name);
- theme_dir = g_strdup (theme->path);
+ theme = (MateThemeCommonInfo *) mate_theme_meta_info_find (name);
+ theme_dir = g_path_get_dirname (theme->path);
del_empty_parent = FALSE;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/common/mate-theme-info.c
new/mate-control-center-1.20.2/capplets/common/mate-theme-info.c
--- old/mate-control-center-1.20.0/capplets/common/mate-theme-info.c
2018-01-23 11:05:03.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/common/mate-theme-info.c
2018-03-27 14:13:45.000000000 +0200
@@ -32,6 +32,7 @@
#include <glib/gi18n.h>
#include <gmodule.h>
#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gio/gio.h>
#include <string.h>
@@ -383,6 +384,8 @@
str = mate_desktop_item_get_string(meta_theme_ditem, CURSOR_THEME_KEY);
+ GdkWindow *window = gdk_get_default_root_window ();
+ gint scale = gdk_window_get_scale_factor (window);
if (str != NULL)
{
meta_theme_info->cursor_theme_name = g_strdup(str);
@@ -399,6 +402,7 @@
meta_theme_info->cursor_theme_name = g_strdup("default");
meta_theme_info->cursor_size = 18;
}
+ meta_theme_info->cursor_size *= scale;
str = mate_desktop_item_get_string(meta_theme_ditem,
APPLICATION_FONT_KEY);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-control-center-1.20.0/capplets/display/xrandr-capplet.c
new/mate-control-center-1.20.2/capplets/display/xrandr-capplet.c
--- old/mate-control-center-1.20.0/capplets/display/xrandr-capplet.c
2018-01-23 11:05:03.000000000 +0100
+++ new/mate-control-center-1.20.2/capplets/display/xrandr-capplet.c
2018-03-23 12:48:30.000000000 +0100
@@ -1153,6 +1153,7 @@
int x, y, w, h;
mate_rr_output_info_get_geometry (output, &x, &y, &w, &h);
+ get_geometry(output, &w, &h); // accounts for rotation
/* Top, Bottom, Left, Right */
add_edge (output, x, y, x + w, y, edges);
@@ -1351,6 +1352,7 @@
get_output_rect (MateRROutputInfo *output, GdkRectangle *rect)
{
mate_rr_output_info_get_geometry (output, &rect->x, &rect->y,
&rect->width, &rect->height);
+ get_geometry (output, &rect->width, &rect->height); // accounts for
rotation
}
static gboolean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-control-center-1.20.0/configure
new/mate-control-center-1.20.2/configure
--- old/mate-control-center-1.20.0/configure 2018-02-06 17:53:30.000000000
+0100
+++ new/mate-control-center-1.20.2/configure 2018-03-27 14:16:43.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-control-center 1.20.0.
+# Generated by GNU Autoconf 2.69 for mate-control-center 1.20.2.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-control-center'
PACKAGE_TARNAME='mate-control-center'
-PACKAGE_VERSION='1.20.0'
-PACKAGE_STRING='mate-control-center 1.20.0'
+PACKAGE_VERSION='1.20.2'
+PACKAGE_STRING='mate-control-center 1.20.2'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1520,7 +1520,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mate-control-center 1.20.0 to adapt to many kinds of
systems.
+\`configure' configures mate-control-center 1.20.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1595,7 +1595,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-control-center 1.20.0:";;
+ short | recursive ) echo "Configuration of mate-control-center 1.20.2:";;
esac
cat <<\_ACEOF
@@ -1815,7 +1815,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-control-center configure 1.20.0
+mate-control-center configure 1.20.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2184,7 +2184,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-control-center $as_me 1.20.0, which was
+It was created by mate-control-center $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3053,7 +3053,7 @@
# Define the identity of the package.
PACKAGE='mate-control-center'
- VERSION='1.20.0'
+ VERSION='1.20.2'
cat >>confdefs.h <<_ACEOF
@@ -18449,7 +18449,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-control-center $as_me 1.20.0, which was
+This file was extended by mate-control-center $as_me 1.20.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18515,7 +18515,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-control-center config.status 1.20.0
+mate-control-center config.status 1.20.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-control-center-1.20.0/configure.ac
new/mate-control-center-1.20.2/configure.ac
--- old/mate-control-center-1.20.0/configure.ac 2018-01-30 20:14:05.000000000
+0100
+++ new/mate-control-center-1.20.2/configure.ac 2018-03-27 14:14:32.000000000
+0200
@@ -1,4 +1,4 @@
-AC_INIT([mate-control-center], [1.20.0], [http://www.mate-desktop.org/])
+AC_INIT([mate-control-center], [1.20.2], [http://www.mate-desktop.org/])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([shell])
