mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2025-12-31 20:36:25 +00:00
windowsettings: remove legacy window settings
We don't actually track any of this anyway, and it's not that useful in a wayland world, so just drop it.
This commit is contained in:
Christian Hergert
@ -1,20 +1,5 @@
|
|||||||
<schemalist>
|
<schemalist>
|
||||||
<schema id="org.gnome.sysprof3" path="/org/gnome/sysprof/" gettext-domain="sysprof">
|
<schema id="org.gnome.sysprof3" path="/org/gnome/sysprof/" gettext-domain="sysprof">
|
||||||
<key name="window-size" type="(ii)">
|
|
||||||
<default>(-1, -1)</default>
|
|
||||||
<summary>Window size</summary>
|
|
||||||
<description>Window size (width and height).</description>
|
|
||||||
</key>
|
|
||||||
<key name="window-position" type="(ii)">
|
|
||||||
<default>(-1,-1)</default>
|
|
||||||
<summary>Window position</summary>
|
|
||||||
<description>Window position (x and y).</description>
|
|
||||||
</key>
|
|
||||||
<key name="window-maximized" type="b">
|
|
||||||
<default>true</default>
|
|
||||||
<summary>Window maximized</summary>
|
|
||||||
<description>Window maximized state</description>
|
|
||||||
</key>
|
|
||||||
<key name="last-spawn-argv" type="s">
|
<key name="last-spawn-argv" type="s">
|
||||||
<default>''</default>
|
<default>''</default>
|
||||||
<summary>Last Spawn Program</summary>
|
<summary>Last Spawn Program</summary>
|
||||||
|
|||||||
@ -5,7 +5,6 @@ sysprof_sources = [
|
|||||||
'sysprof.c',
|
'sysprof.c',
|
||||||
'sysprof-application.c',
|
'sysprof-application.c',
|
||||||
'sysprof-window.c',
|
'sysprof-window.c',
|
||||||
'sysprof-window-settings.c',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
sysprof_resources = gnome.compile_resources('sysprof-resources', 'sysprof.gresource.xml',
|
sysprof_resources = gnome.compile_resources('sysprof-resources', 'sysprof.gresource.xml',
|
||||||
|
|||||||
@ -1,175 +0,0 @@
|
|||||||
/* sysprof-window-settings.c
|
|
||||||
*
|
|
||||||
* Copyright 2016 Christian Hergert <chergert@redhat.com>
|
|
||||||
*
|
|
||||||
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "sysprof-window.h"
|
|
||||||
#include "sysprof-window-settings.h"
|
|
||||||
|
|
||||||
#define WINDOW_MIN_WIDTH 1200
|
|
||||||
#define WINDOW_MIN_HEIGHT 700
|
|
||||||
#define SAVE_TIMEOUT_SECS 1
|
|
||||||
|
|
||||||
static GSettings *settings;
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
sysprof_window_settings__window_save_settings_cb (gpointer data)
|
|
||||||
{
|
|
||||||
GtkWindow *window = data;
|
|
||||||
GdkRectangle geom;
|
|
||||||
gboolean maximized;
|
|
||||||
|
|
||||||
g_assert (GTK_IS_WINDOW (window));
|
|
||||||
g_assert (G_IS_SETTINGS (settings));
|
|
||||||
|
|
||||||
g_object_set_data (G_OBJECT (window), "SETTINGS_HANDLER_ID", NULL);
|
|
||||||
|
|
||||||
gtk_window_get_size (window, &geom.width, &geom.height);
|
|
||||||
gtk_window_get_position (window, &geom.x, &geom.y);
|
|
||||||
maximized = gtk_window_is_maximized (window);
|
|
||||||
|
|
||||||
g_settings_set (settings, "window-size", "(ii)", geom.width, geom.height);
|
|
||||||
g_settings_set (settings, "window-position", "(ii)", geom.x, geom.y);
|
|
||||||
g_settings_set_boolean (settings, "window-maximized", maximized);
|
|
||||||
|
|
||||||
return G_SOURCE_REMOVE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
sysprof_window_settings__window_configure_event (GtkWindow *window,
|
|
||||||
GdkEventConfigure *event)
|
|
||||||
{
|
|
||||||
guint handler;
|
|
||||||
|
|
||||||
g_assert (GTK_IS_WINDOW (window));
|
|
||||||
g_assert (event != NULL);
|
|
||||||
g_assert (G_IS_SETTINGS (settings));
|
|
||||||
|
|
||||||
handler = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "SETTINGS_HANDLER_ID"));
|
|
||||||
|
|
||||||
if (handler == 0)
|
|
||||||
{
|
|
||||||
handler = g_timeout_add_seconds (SAVE_TIMEOUT_SECS,
|
|
||||||
sysprof_window_settings__window_save_settings_cb,
|
|
||||||
window);
|
|
||||||
g_object_set_data (G_OBJECT (window), "SETTINGS_HANDLER_ID", GINT_TO_POINTER (handler));
|
|
||||||
}
|
|
||||||
|
|
||||||
return GDK_EVENT_PROPAGATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sysprof_window_settings__window_realize (GtkWindow *window)
|
|
||||||
{
|
|
||||||
GtkApplication *app;
|
|
||||||
GdkRectangle geom = { 0 };
|
|
||||||
gboolean maximized = FALSE;
|
|
||||||
GList *list;
|
|
||||||
guint count = 0;
|
|
||||||
|
|
||||||
g_assert (GTK_IS_WINDOW (window));
|
|
||||||
g_assert (G_IS_SETTINGS (settings));
|
|
||||||
|
|
||||||
g_settings_get (settings, "window-position", "(ii)", &geom.x, &geom.y);
|
|
||||||
g_settings_get (settings, "window-size", "(ii)", &geom.width, &geom.height);
|
|
||||||
g_settings_get (settings, "window-maximized", "b", &maximized);
|
|
||||||
|
|
||||||
geom.width = MAX (geom.width, WINDOW_MIN_WIDTH);
|
|
||||||
geom.height = MAX (geom.height, WINDOW_MIN_HEIGHT);
|
|
||||||
gtk_window_set_default_size (window, geom.width, geom.height);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If there are other windows currently visible other than this one,
|
|
||||||
* then ignore positioning and let the window manager decide.
|
|
||||||
*/
|
|
||||||
count = 0;
|
|
||||||
app = GTK_APPLICATION (g_application_get_default ());
|
|
||||||
list = gtk_application_get_windows (app);
|
|
||||||
for (; list != NULL; list = list->next)
|
|
||||||
{
|
|
||||||
GtkWindow *ele = list->data;
|
|
||||||
|
|
||||||
if (SYSPROF_IS_WINDOW (ele) && (ele != window) &&
|
|
||||||
gtk_widget_get_visible (GTK_WIDGET (window)))
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count == 0)
|
|
||||||
gtk_window_move (window, geom.x, geom.y);
|
|
||||||
|
|
||||||
if (maximized)
|
|
||||||
gtk_window_maximize (window);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
sysprof_window_settings__window_destroy (GtkWindow *window)
|
|
||||||
{
|
|
||||||
guint handler;
|
|
||||||
|
|
||||||
g_assert (GTK_IS_WINDOW (window));
|
|
||||||
g_assert (G_IS_SETTINGS (settings));
|
|
||||||
|
|
||||||
handler = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "SETTINGS_HANDLER_ID"));
|
|
||||||
|
|
||||||
if (handler != 0)
|
|
||||||
{
|
|
||||||
g_source_remove (handler);
|
|
||||||
g_object_set_data (G_OBJECT (window), "SETTINGS_HANDLER_ID", NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_signal_handlers_disconnect_by_func (window,
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_configure_event),
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_signal_handlers_disconnect_by_func (window,
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_destroy),
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_signal_handlers_disconnect_by_func (window,
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_realize),
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_object_unref (settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
sysprof_window_settings_register (GtkWindow *window)
|
|
||||||
{
|
|
||||||
if (settings == NULL)
|
|
||||||
{
|
|
||||||
settings = g_settings_new ("org.gnome.sysprof3");
|
|
||||||
g_object_add_weak_pointer (G_OBJECT (settings), (gpointer *)&settings);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
g_object_ref (settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_signal_connect (window,
|
|
||||||
"configure-event",
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_configure_event),
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_signal_connect (window,
|
|
||||||
"destroy",
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_destroy),
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
g_signal_connect (window,
|
|
||||||
"realize",
|
|
||||||
G_CALLBACK (sysprof_window_settings__window_realize),
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
/* sysprof-window-settings.h
|
|
||||||
*
|
|
||||||
* Copyright 2016 Christian Hergert <chergert@redhat.com>
|
|
||||||
*
|
|
||||||
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SYSPROF_WINDOW_SETTINGS_H
|
|
||||||
#define SYSPROF_WINDOW_SETTINGS_H
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
void sysprof_window_settings_register (GtkWindow *window);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* SYSPROF_WINDOW_SETTINGS_H */
|
|
||||||
Reference in New Issue
Block a user