applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

project: Remove CcInfoPanel

Browse source 
This panel was hidden in the new shell, and now that
we don't have the old one, can be safely dropped.

Minor adjustments were made to the other panels to
properly remove this panel.

https://bugzilla.gnome.org/show_bug.cgi?id=790923
This commit is contained in:
Georges Basile Stavracas Neto 2017-11-11 01:22:40 -02:00
parent b23ef59926
commit 6123d97e3f
14 changed files with 22 additions and 396 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -515,7 +515,6 @@ panels/sound/data/icons/scalable/apps/Makefile
panels/sound/data/icons/scalable/devices/Makefile
panels/sound/data/sounds/Makefile
panels/info/Makefile
panels/info/gnome-info-panel.desktop.in
panels/info/gnome-info-overview-panel.desktop.in
panels/info/gnome-default-apps-panel.desktop.in
panels/info/gnome-removable-media-panel.desktop.in

25
panels/info/Makefile.am
View file

@ -17,19 +17,17 @@ BUILT_SOURCES = \
cc-info-resources.c \
cc-info-resources.h
libinfo_la_SOURCES = \
$(BUILT_SOURCES) \
cc-info-panel.c \
cc-info-panel.h \
cc-info-overview-panel.c \
cc-info-overview-panel.h \
cc-info-default-apps-panel.c \
cc-info-default-apps-panel.h \
cc-info-removable-media-panel.c \
cc-info-removable-media-panel.h \
gsd-disk-space-helper.h \
gsd-disk-space-helper.c \
info-cleanup.h \
libinfo_la_SOURCES = \
$(BUILT_SOURCES) \
cc-info-overview-panel.c \
cc-info-overview-panel.h \
cc-info-default-apps-panel.c \
cc-info-default-apps-panel.h \
cc-info-removable-media-panel.c \
cc-info-removable-media-panel.h \
gsd-disk-space-helper.h \
gsd-disk-space-helper.c \
info-cleanup.h \
info-cleanup.c
libinfo_la_LIBADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
@ -53,7 +51,6 @@ cc-info-resources.h: info.gresource.xml $(resource_files)
desktopdir = $(datadir)/applications
desktop_in_files = \
gnome-info-panel.desktop.in \
gnome-info-overview-panel.desktop.in \
gnome-default-apps-panel.desktop.in \
gnome-removable-media-panel.desktop.in

3
panels/info/cc-info-default-apps-panel.c
View file

@ -21,7 +21,6 @@
#include <config.h>
#include "cc-info-panel.h"
#include "cc-info-resources.h"
#include "info-cleanup.h"
@ -201,6 +200,8 @@ cc_info_default_apps_panel_class_init (CcInfoDefaultAppsPanelClass *klass)
static void
cc_info_default_apps_panel_init (CcInfoDefaultAppsPanel *self)
{
g_resources_register (cc_info_get_resource ());
gtk_widget_init_template (GTK_WIDGET (self));
info_panel_setup_default_apps (self);

2
panels/info/cc-info-default-apps-panel.h
View file

@ -20,7 +20,7 @@
#ifndef CC_INFO_DEFAULT_APPS_PANEL_H
#define CC_INFO_DEFAULT_APPS_PANEL_H
#include <gtk/gtk.h>
#include <shell/cc-panel.h>
G_BEGIN_DECLS

5
panels/info/cc-info-overview-panel.c
View file

@ -21,7 +21,6 @@
#include <config.h>
#include "cc-info-panel.h"
#include "cc-info-resources.h"
#include "info-cleanup.h"
@ -36,6 +35,8 @@
#include <glibtop/mem.h>
#include <glibtop/sysinfo.h>
#include <gdk/gdk.h>
#ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h>
#endif
@ -937,6 +938,8 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
gtk_widget_init_template (GTK_WIDGET (self));
g_resources_register (cc_info_get_resource ());
priv->graphics_data = get_graphics_data ();
if (does_gnome_software_exist () || does_gpk_update_viewer_exist ())

2
panels/info/cc-info-overview-panel.h
View file

@ -20,7 +20,7 @@
#ifndef CC_INFO_OVERVIEWPANEL_H
#define CC_INFO_OVERVIEWPANEL_H
#include <gtk/gtk.h>
#include <shell/cc-panel.h>
G_BEGIN_DECLS

194
panels/info/cc-info-panel.c
View file

@ -1,194 +0,0 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2010 Red Hat, Inc
* Copyright (C) 2008 William Jon McCann <jmccann@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 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, see <http://www.gnu.org/licenses/>.
*
*/
#include <config.h>
#include "cc-info-panel.h"
#include "cc-info-overview-panel.h"
#include "cc-info-default-apps-panel.h"
#include "cc-info-removable-media-panel.h"
#include "cc-info-resources.h"
#include "info-cleanup.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gio/gunixmounts.h>
#include <gio/gdesktopappinfo.h>
#include <glibtop/fsusage.h>
#include <glibtop/mountlist.h>
#include <glibtop/mem.h>
#include <glibtop/sysinfo.h>
#ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h>
#endif
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include "gsd-disk-space-helper.h"
#define WID(w) (GtkWidget *) gtk_builder_get_object (self->builder, w)
struct _CcInfoPanel
{
CcPanel parent_instance;
GtkBuilder *builder;
};
CC_PANEL_REGISTER (CcInfoPanel, cc_info_panel)
static void
cc_info_panel_dispose (GObject *object)
{
CcInfoPanel *self = CC_INFO_PANEL (object);
g_clear_object (&self->builder);
G_OBJECT_CLASS (cc_info_panel_parent_class)->dispose (object);
}
static void
cc_info_panel_class_init (CcInfoPanelClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = cc_info_panel_dispose;
g_type_ensure (CC_TYPE_INFO_OVERVIEW_PANEL);
g_type_ensure (CC_TYPE_INFO_DEFAULT_APPS_PANEL);
g_type_ensure (CC_TYPE_INFO_REMOVABLE_MEDIA_PANEL);
}
static void
on_section_changed (GtkTreeSelection *selection,
gpointer data)
{
CcInfoPanel *self = CC_INFO_PANEL (data);
GtkTreeIter iter;
GtkTreeModel *model;
GtkTreePath *path;
gint *indices;
int index;
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
path = gtk_tree_model_get_path (model, &iter);
indices = gtk_tree_path_get_indices (path);
index = indices[0];
if (index >= 0)
{
g_object_set (G_OBJECT (WID ("notebook")),
"page", index, NULL);
}
gtk_tree_path_free (path);
}
static void
info_panel_setup_selector (CcInfoPanel *self)
{
GtkTreeView *view;
GtkListStore *model;
GtkTreeSelection *selection;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeIter iter;
int section_name_column = 0;
view = GTK_TREE_VIEW (WID ("overview_treeview"));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
model = gtk_list_store_new (1, G_TYPE_STRING);
gtk_tree_view_set_model (view, GTK_TREE_MODEL (model));
g_object_unref (model);
renderer = gtk_cell_renderer_text_new ();
gtk_cell_renderer_set_padding (renderer, 4, 4);
g_object_set (renderer,
"width-chars", 20,
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
column = gtk_tree_view_column_new_with_attributes (_("Section"),
renderer,
"text", section_name_column,
NULL);
gtk_tree_view_append_column (view, column);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, section_name_column,
_("Overview"),
-1);
gtk_tree_selection_select_iter (selection, &iter);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, section_name_column,
_("Default Applications"),
-1);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, section_name_column,
_("Removable Media"),
-1);
g_signal_connect (selection, "changed",
G_CALLBACK (on_section_changed), self);
on_section_changed (selection, self);
gtk_widget_show_all (GTK_WIDGET (view));
}
static void
info_panel_setup_overview (CcInfoPanel *self)
{
GtkWidget *widget;
widget = WID ("info_vbox");
gtk_container_add (GTK_CONTAINER (self), widget);
}
static void
cc_info_panel_init (CcInfoPanel *self)
{
GError *error = NULL;
g_resources_register (cc_info_get_resource ());
self->builder = gtk_builder_new ();
if (gtk_builder_add_from_resource (self->builder,
"/org/gnome/control-center/info/info.ui",
&error) == 0)
{
g_warning ("Could not load interface file: %s", error->message);
g_error_free (error);
return;
}
info_panel_setup_selector (self);
info_panel_setup_overview (self);
}

33
panels/info/cc-info-panel.h
View file

@ -1,33 +0,0 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2010 Red Hat, Inc
*
* 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, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef _CC_INFO_PANEL_H
#define _CC_INFO_PANEL_H
#include <shell/cc-panel.h>
G_BEGIN_DECLS
#define CC_TYPE_INFO_PANEL (cc_info_panel_get_type ())
G_DECLARE_FINAL_TYPE (CcInfoPanel, cc_info_panel, CC, INFO_PANEL, CcPanel)
G_END_DECLS
#endif /* _CC_INFO_PANEL_H */

3
panels/info/cc-info-removable-media-panel.c
View file

@ -21,7 +21,6 @@
#include <config.h>
#include "cc-info-panel.h"
#include "cc-info-resources.h"
#include "info-cleanup.h"
@ -618,6 +617,8 @@ cc_info_removable_media_panel_class_init (CcInfoRemovableMediaPanelClass *klass)
static void
cc_info_removable_media_panel_init (CcInfoRemovableMediaPanel *self)
{
g_resources_register (cc_info_get_resource ());
gtk_widget_init_template (GTK_WIDGET (self));
self->media_settings = g_settings_new (MEDIA_HANDLING_SCHEMA);

2
panels/info/cc-info-removable-media-panel.h
View file

@ -20,7 +20,7 @@
#ifndef CC_INFO_REMOVABLE_MEDIA_PANEL_H
#define CC_INFO_REMOVABLE_MEDIA_PANEL_H
#include <gtk/gtk.h>
#include <shell/cc-panel.h>
G_BEGIN_DECLS

20
panels/info/gnome-info-panel.desktop.in.in
View file

@ -1,20 +0,0 @@
[Desktop Entry]
# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
_Name=De­tails
_Comment=View information about your system
Exec=gnome-control-center info
Icon=applications-system
Terminal=false
Type=Application
NoDisplay=true
StartupNotify=true
Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center
X-GNOME-Bugzilla-Component=info
X-GNOME-Bugzilla-Version=@VERSION@
# Translators: those are keywords for the System Information panel
# "Preferred Applications" is the old name for the preference, so make
# sure that you use the same "translation" for those keywords
_Keywords=device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;

1
panels/info/info.gresource.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/control-center/info">
<file preprocess="xml-stripblanks">info.ui</file>
<file preprocess="xml-stripblanks">info-overview.ui</file>
<file preprocess="xml-stripblanks">info-default-apps.ui</file>
<file preprocess="xml-stripblanks">info-removable-media.ui</file>

125
panels/info/info.ui
View file

@ -1,125 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="info_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="overview_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection"/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="detail_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="CcInfoOverviewPanel" id="overview_container">
<property name="visible">true</property>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Overview</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="CcInfoDefaultAppsPanel" id="default_apps_container">
<property name="visible">true</property>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Default Applications</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="CcInfoRemovableMediaPanel" id="media_preferences_vbox">
<property name="visible">true</property>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Removable Media</property>
</object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface>

2
shell/cc-panel-loader.c
View file

@ -36,7 +36,6 @@ extern GType cc_bluetooth_panel_get_type (void);
extern GType cc_color_panel_get_type (void);
extern GType cc_date_time_panel_get_type (void);
extern GType cc_display_panel_get_type (void);
extern GType cc_info_panel_get_type (void);
extern GType cc_info_overview_panel_get_type (void);
extern GType cc_info_default_apps_panel_get_type (void);
extern GType cc_info_removable_media_panel_get_type (void);
@ -82,7 +81,6 @@ static struct {
PANEL_TYPE("color", cc_color_panel_get_type ),
PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
PANEL_TYPE("display", cc_display_panel_get_type ),
PANEL_TYPE("info", cc_info_panel_get_type ),
PANEL_TYPE("info-overview", cc_info_overview_panel_get_type),
PANEL_TYPE("default-apps", cc_info_default_apps_panel_get_type),
PANEL_TYPE("removable-media", cc_info_removable_media_panel_get_type),