[gnome-control-center] Panels: Rename lock panel into screen panel
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Panels: Rename lock panel into screen panel
- Date: Thu, 28 Jul 2022 22:52:05 +0000 (UTC)
commit b327301951436b5d1582eb19572e7079768426e1
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date: Tue Jan 25 02:30:09 2022 +0100
Panels: Rename lock panel into screen panel
This was designed some time ago [1] but never actually implemented, so:
- Change the screen lock section to "screen"
- Move the screen section up, so it's next to the other types of
hardware
- Added a Screen lock section in there
[1] https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/909#note_737827
panels/lock/cc-lock-panel.h | 55 ---------
.../org.gnome.Settings-screen-lock-symbolic.svg | 4 -
panels/lock/lock.gresource.xml | 6 -
panels/meson.build | 2 +-
.../cc-lock-panel.c => screen/cc-screen-panel.c} | 123 ++++++++++-----------
panels/screen/cc-screen-panel.h | 55 +++++++++
.../cc-lock-panel.ui => screen/cc-screen-panel.ui} | 7 +-
.../gnome-screen-panel.desktop.in.in} | 12 +-
panels/{lock => screen}/icons/meson.build | 2 +-
.../org.gnome.Settings-screen-symbolic.svg | 4 +
panels/{lock => screen}/meson.build | 8 +-
panels/screen/screen.gresource.xml | 6 +
shell/cc-panel-loader.c | 4 +-
13 files changed, 144 insertions(+), 144 deletions(-)
---
diff --git a/panels/meson.build b/panels/meson.build
index 8d4661d2d..cb732f2e7 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -13,7 +13,6 @@ panels = [
'info-overview',
'keyboard',
'location',
- 'lock',
'microphone',
'mouse',
'multitasking',
@@ -23,6 +22,7 @@ panels = [
'printers',
'region',
'removable-media',
+ 'screen',
'search',
'sharing',
'sound',
diff --git a/panels/lock/cc-lock-panel.c b/panels/screen/cc-screen-panel.c
similarity index 75%
rename from panels/lock/cc-lock-panel.c
rename to panels/screen/cc-screen-panel.c
index 24dcc7a87..891cb71f9 100644
--- a/panels/lock/cc-lock-panel.c
+++ b/panels/screen/cc-screen-panel.c
@@ -19,16 +19,16 @@
* Author: Matthias Clasen <mclasen redhat com>
*/
-#include "cc-lock-panel.h"
-#include "cc-lock-panel-enums.h"
-#include "cc-lock-resources.h"
+#include "cc-screen-panel.h"
+#include "cc-screen-panel-enums.h"
+#include "cc-screen-resources.h"
#include "cc-util.h"
#include <adwaita.h>
#include <gio/gdesktopappinfo.h>
#include <glib/gi18n.h>
-struct _CcLockPanel
+struct _CcScreenPanel
{
CcPanel parent_instance;
@@ -39,16 +39,16 @@ struct _CcLockPanel
GCancellable *cancellable;
- GtkSwitch *automatic_screen_lock_switch;
AdwComboRow *blank_screen_row;
AdwComboRow *lock_after_row;
- GtkSwitch *show_notifications_switch;
- GtkSwitch *usb_protection_switch;
GDBusProxy *usb_proxy;
GtkListBoxRow *usb_protection_row;
+ GtkSwitch *automatic_screen_lock_switch;
+ GtkSwitch *show_notifications_switch;
+ GtkSwitch *usb_protection_switch;
};
-CC_PANEL_REGISTER (CcLockPanel, cc_lock_panel)
+CC_PANEL_REGISTER (CcScreenPanel, cc_screen_panel)
static char *
lock_after_name_cb (AdwEnumListItem *item,
@@ -57,28 +57,28 @@ lock_after_name_cb (AdwEnumListItem *item,
switch (adw_enum_list_item_get_value (item))
{
- case CC_LOCK_PANEL_LOCK_AFTER_SCREEN_OFF:
+ case CC_SCREEN_PANEL_LOCK_AFTER_SCREEN_OFF:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup(C_("lock_screen", "Screen Turns Off"));
- case CC_LOCK_PANEL_LOCK_AFTER_30_SEC:
+ case CC_SCREEN_PANEL_LOCK_AFTER_30_SEC:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "30 seconds"));
- case CC_LOCK_PANEL_LOCK_AFTER_1_MIN:
+ case CC_SCREEN_PANEL_LOCK_AFTER_1_MIN:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "1 minute"));
- case CC_LOCK_PANEL_LOCK_AFTER_2_MIN:
+ case CC_SCREEN_PANEL_LOCK_AFTER_2_MIN:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "2 minutes"));
- case CC_LOCK_PANEL_LOCK_AFTER_3_MIN:
+ case CC_SCREEN_PANEL_LOCK_AFTER_3_MIN:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "3 minutes"));
- case CC_LOCK_PANEL_LOCK_AFTER_5_MIN:
+ case CC_SCREEN_PANEL_LOCK_AFTER_5_MIN:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "5 minutes"));
- case CC_LOCK_PANEL_LOCK_AFTER_30_MIN:
+ case CC_SCREEN_PANEL_LOCK_AFTER_30_MIN:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "30 minutes"));
- case CC_LOCK_PANEL_LOCK_AFTER_1_HR:
+ case CC_SCREEN_PANEL_LOCK_AFTER_1_HR:
/* Translators: Option for "Lock screen after blank" in "Screen Lock" panel */
return g_strdup (C_("lock_screen", "1 hour"));
default:
@@ -87,12 +87,12 @@ lock_after_name_cb (AdwEnumListItem *item,
}
static void
-on_lock_combo_changed_cb (AdwComboRow *combo_row,
- GParamSpec *pspec,
- CcLockPanel *self)
+on_lock_combo_changed_cb (AdwComboRow *combo_row,
+ GParamSpec *pspec,
+ CcScreenPanel *self)
{
AdwEnumListItem *item;
- CcLockPanelLockAfter delay;
+ CcScreenPanelLockAfter delay;
item = ADW_ENUM_LIST_ITEM (adw_combo_row_get_selected_item (combo_row));
delay = adw_enum_list_item_get_value (item);
@@ -101,8 +101,8 @@ on_lock_combo_changed_cb (AdwComboRow *combo_row,
}
static void
-set_lock_value_for_combo (AdwComboRow *combo_row,
- CcLockPanel *self)
+set_lock_value_for_combo (AdwComboRow *combo_row,
+ CcScreenPanel *self)
{
AdwEnumListModel *model;
guint value;
@@ -121,34 +121,34 @@ screen_delay_name_cb (AdwEnumListItem *item,
switch (adw_enum_list_item_get_value (item))
{
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_1_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_1_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "1 minute"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_2_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_2_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "2 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_3_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_3_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "3 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_4_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_4_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "4 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_5_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_5_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "5 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_8_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_8_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "8 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_10_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_10_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "10 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_12_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_12_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "12 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_15_MIN:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_15_MIN:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "15 minutes"));
- case CC_LOCK_PANEL_BLANK_SCREEN_DELAY_NEVER:
+ case CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_NEVER:
/* Translators: Option for "Blank screen" in "Screen Lock" panel */
return g_strdup (C_("blank_screen", "Never"));
default:
@@ -157,8 +157,8 @@ screen_delay_name_cb (AdwEnumListItem *item,
}
static void
-set_blank_screen_delay_value (CcLockPanel *self,
- gint value)
+set_blank_screen_delay_value (CcScreenPanel *self,
+ gint value)
{
AdwEnumListModel *model;
@@ -169,12 +169,12 @@ set_blank_screen_delay_value (CcLockPanel *self,
}
static void
-on_blank_screen_delay_changed_cb (AdwComboRow *combo_row,
- GParamSpec *pspec,
- CcLockPanel *self)
+on_blank_screen_delay_changed_cb (AdwComboRow *combo_row,
+ GParamSpec *pspec,
+ CcScreenPanel *self)
{
AdwEnumListItem *item;
- CcLockPanelBlankScreenDelay delay;
+ CcScreenPanelBlankScreenDelay delay;
item = ADW_ENUM_LIST_ITEM (adw_combo_row_get_selected_item (combo_row));
delay = adw_enum_list_item_get_value (item);
@@ -183,10 +183,10 @@ on_blank_screen_delay_changed_cb (AdwComboRow *combo_row,
}
static void
-on_usb_protection_properties_changed_cb (GDBusProxy *usb_proxy,
- GVariant *changed_properties,
- GStrv invalidated_properties,
- CcLockPanel *self)
+on_usb_protection_properties_changed_cb (GDBusProxy *usb_proxy,
+ GVariant *changed_properties,
+ GStrv invalidated_properties,
+ CcScreenPanel *self)
{
gboolean available = FALSE;
@@ -209,7 +209,7 @@ on_usb_protection_param_ready (GObject *source_object,
gpointer user_data)
{
g_autoptr(GError) error = NULL;
- CcLockPanel *self;
+ CcScreenPanel *self;
GDBusProxy *proxy;
self = user_data;
@@ -236,9 +236,9 @@ on_usb_protection_param_ready (GObject *source_object,
}
static void
-cc_lock_panel_finalize (GObject *object)
+cc_screen_panel_finalize (GObject *object)
{
- CcLockPanel *self = CC_LOCK_PANEL (object);
+ CcScreenPanel *self = CC_SCREEN_PANEL (object);
g_cancellable_cancel (self->cancellable);
g_clear_object (&self->cancellable);
@@ -247,41 +247,40 @@ cc_lock_panel_finalize (GObject *object)
g_clear_object (&self->session_settings);
g_clear_object (&self->usb_proxy);
- G_OBJECT_CLASS (cc_lock_panel_parent_class)->finalize (object);
+ G_OBJECT_CLASS (cc_screen_panel_parent_class)->finalize (object);
}
static void
-cc_lock_panel_class_init (CcLockPanelClass *klass)
+cc_screen_panel_class_init (CcScreenPanelClass *klass)
{
GObjectClass *oclass = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- oclass->finalize = cc_lock_panel_finalize;
+ oclass->finalize = cc_screen_panel_finalize;
- g_type_ensure (CC_TYPE_LOCK_PANEL_LOCK_AFTER);
- g_type_ensure (CC_TYPE_LOCK_PANEL_BLANK_SCREEN_DELAY);
+ g_type_ensure (CC_TYPE_SCREEN_PANEL_LOCK_AFTER);
+ g_type_ensure (CC_TYPE_SCREEN_PANEL_BLANK_SCREEN_DELAY);
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/screen/cc-screen-panel.ui");
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/lock/cc-lock-panel.ui");
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, automatic_screen_lock_switch);
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, blank_screen_row);
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, lock_after_row);
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, show_notifications_switch);
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, usb_protection_row);
+ gtk_widget_class_bind_template_child (widget_class, CcScreenPanel, usb_protection_switch);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, automatic_screen_lock_switch);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, blank_screen_row);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, lock_after_row);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, show_notifications_switch);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, usb_protection_switch);
- gtk_widget_class_bind_template_child (widget_class, CcLockPanel, usb_protection_row);
-
- gtk_widget_class_bind_template_callback (widget_class, screen_delay_name_cb);
- gtk_widget_class_bind_template_callback (widget_class, on_blank_screen_delay_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, lock_after_name_cb);
+ gtk_widget_class_bind_template_callback (widget_class, on_blank_screen_delay_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, on_lock_combo_changed_cb);
+ gtk_widget_class_bind_template_callback (widget_class, screen_delay_name_cb);
}
static void
-cc_lock_panel_init (CcLockPanel *self)
+cc_screen_panel_init (CcScreenPanel *self)
{
guint value;
- g_resources_register (cc_lock_get_resource ());
+ g_resources_register (cc_screen_get_resource ());
gtk_widget_init_template (GTK_WIDGET (self));
diff --git a/panels/screen/cc-screen-panel.h b/panels/screen/cc-screen-panel.h
new file mode 100644
index 000000000..c1917f9c8
--- /dev/null
+++ b/panels/screen/cc-screen-panel.h
@@ -0,0 +1,55 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2018 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/>.
+ *
+ * Author: Matthias Clasen <mclasen redhat com>
+ */
+
+#pragma once
+
+#include <shell/cc-panel.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_LOCK_PANEL (cc_screen_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcScreenPanel, cc_screen_panel, CC, SCREEN_PANEL, CcPanel)
+
+typedef enum {
+ CC_SCREEN_PANEL_LOCK_AFTER_SCREEN_OFF = 0,
+ CC_SCREEN_PANEL_LOCK_AFTER_30_SEC = 30,
+ CC_SCREEN_PANEL_LOCK_AFTER_1_MIN = 60,
+ CC_SCREEN_PANEL_LOCK_AFTER_2_MIN = 120,
+ CC_SCREEN_PANEL_LOCK_AFTER_3_MIN = 180,
+ CC_SCREEN_PANEL_LOCK_AFTER_5_MIN = 300,
+ CC_SCREEN_PANEL_LOCK_AFTER_30_MIN = 1800,
+ CC_SCREEN_PANEL_LOCK_AFTER_1_HR = 3600,
+} CcScreenPanelLockAfter;
+
+typedef enum {
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_1_MIN = 60,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_2_MIN = 120,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_3_MIN = 180,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_4_MIN = 240,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_5_MIN = 300,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_8_MIN = 480,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_10_MIN = 600,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_12_MIN = 720,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_15_MIN = 900,
+ CC_SCREEN_PANEL_BLANK_SCREEN_DELAY_NEVER = 0,
+} CcScreenPanelBlankScreenDelay;
+
+
+G_END_DECLS
diff --git a/panels/lock/cc-lock-panel.ui b/panels/screen/cc-screen-panel.ui
similarity index 94%
rename from panels/lock/cc-lock-panel.ui
rename to panels/screen/cc-screen-panel.ui
index a1a6fef54..1f9fb78ca 100644
--- a/panels/lock/cc-lock-panel.ui
+++ b/panels/screen/cc-screen-panel.ui
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="CcLockPanel" parent="CcPanel">
+ <template class="CcScreenPanel" parent="CcPanel">
<child type="content">
<object class="AdwPreferencesPage">
<child>
<object class="AdwPreferencesGroup">
+ <property name="title" translatable="yes">Screen Lock</property>
<property name="description" translatable="yes">Automatically locking the screen prevents others
from accessing the computer while you're away.</property>
<!-- Blank Screen Delay row -->
@@ -17,7 +18,7 @@
<signal name="notify::selected-item" handler="on_blank_screen_delay_changed_cb"/>
<property name="model">
<object class="AdwEnumListModel">
- <property name="enum-type">CcLockPanelBlankScreenDelay</property>
+ <property name="enum-type">CcScreenPanelBlankScreenDelay</property>
</object>
</property>
<property name="expression">
@@ -53,7 +54,7 @@
<signal name="notify::selected-item" handler="on_lock_combo_changed_cb"/>
<property name="model">
<object class="AdwEnumListModel">
- <property name="enum-type">CcLockPanelLockAfter</property>
+ <property name="enum-type">CcScreenPanelLockAfter</property>
</object>
</property>
<property name="expression">
diff --git a/panels/lock/gnome-lock-panel.desktop.in.in b/panels/screen/gnome-screen-panel.desktop.in.in
similarity index 60%
rename from panels/lock/gnome-lock-panel.desktop.in.in
rename to panels/screen/gnome-screen-panel.desktop.in.in
index 46a11ce5f..e095264c1 100644
--- a/panels/lock/gnome-lock-panel.desktop.in.in
+++ b/panels/screen/gnome-screen-panel.desktop.in.in
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Screen Lock
-Comment=Lock your screen
-Exec=gnome-control-center lock
+Name=Screen
+Comment=Screen Settings
+Exec=gnome-control-center screen
# FIXME
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-screen-lock-symbolic
+Icon=org.gnome.Settings-screen-symbolic
Terminal=false
Type=Application
NoDisplay=true
@@ -13,7 +13,7 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Pri
OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=privacy
+X-GNOME-Bugzilla-Component=screen
X-GNOME-Bugzilla-Version=@VERSION@
-# Translators: Search terms to find the Lock panel. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
+# Translators: Search terms to find the Screen panel. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
Keywords=screen;lock;private;privacy;
diff --git a/panels/lock/icons/meson.build b/panels/screen/icons/meson.build
similarity index 62%
rename from panels/lock/icons/meson.build
rename to panels/screen/icons/meson.build
index df54c56ae..f0e4593e7 100644
--- a/panels/lock/icons/meson.build
+++ b/panels/screen/icons/meson.build
@@ -1,4 +1,4 @@
install_data(
- 'scalable/org.gnome.Settings-screen-lock-symbolic.svg',
+ 'scalable/org.gnome.Settings-screen-symbolic.svg',
install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
)
diff --git a/panels/screen/icons/scalable/org.gnome.Settings-screen-symbolic.svg
b/panels/screen/icons/scalable/org.gnome.Settings-screen-symbolic.svg
new file mode 100644
index 000000000..b27a2bcbe
--- /dev/null
+++ b/panels/screen/icons/scalable/org.gnome.Settings-screen-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg";>
+ <path d="m 3 0 c -1.660156 0 -3 1.339844 -3 3 v 7 c 0 1.660156 1.339844 3 3 3 h 10 c 1.660156 0 3
-1.339844 3 -3 v -7 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 2 h 10 c 0.554688 0 1 0.445312 1 1 v 7 c 0
0.554688 -0.445312 1 -1 1 h -10 c -0.554688 0 -1 -0.445312 -1 -1 v -7 c 0 -0.554688 0.445312 -1 1 -1 z m 2 12
c -1.105469 0 -2 0.894531 -2 2 h 10 c 0 -1.105469 -0.894531 -2 -2 -2 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/panels/lock/meson.build b/panels/screen/meson.build
similarity index 85%
rename from panels/lock/meson.build
rename to panels/screen/meson.build
index 07bda6f86..48482b843 100644
--- a/panels/lock/meson.build
+++ b/panels/screen/meson.build
@@ -16,13 +16,13 @@ i18n.merge_file(
install_dir: control_center_desktopdir
)
-sources = files('cc-lock-panel.c')
+sources = files('cc-screen-panel.c')
-resource_data = files('cc-lock-panel.ui')
+resource_data = files('cc-screen-panel.ui')
sources += gnome.mkenums_simple(
- 'cc-lock-panel-enums',
- sources: ['cc-lock-panel.h'],
+ 'cc-screen-panel-enums',
+ sources: ['cc-screen-panel.h'],
)
sources += gnome.compile_resources(
diff --git a/panels/screen/screen.gresource.xml b/panels/screen/screen.gresource.xml
new file mode 100644
index 000000000..9d1500fda
--- /dev/null
+++ b/panels/screen/screen.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/control-center/screen">
+ <file preprocess="xml-stripblanks">cc-screen-panel.ui</file>
+ </gresource>
+</gresources>
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 5fff89ba6..17f96017f 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -73,7 +73,7 @@ extern GType cc_firmware_security_panel_get_type (void);
extern GType cc_camera_panel_get_type (void);
extern GType cc_microphone_panel_get_type (void);
extern GType cc_usage_panel_get_type (void);
-extern GType cc_lock_panel_get_type (void);
+extern GType cc_screen_panel_get_type (void);
extern GType cc_diagnostics_panel_get_type (void);
/* Static init functions */
@@ -114,7 +114,6 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL),
PANEL_TYPE("location", cc_location_panel_get_type, NULL),
PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type,
cc_firmware_security_panel_static_init_func),
- PANEL_TYPE("lock", cc_lock_panel_get_type, NULL),
PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL),
PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL),
PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL),
@@ -128,6 +127,7 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("printers", cc_printers_panel_get_type, NULL),
PANEL_TYPE("region", cc_region_panel_get_type, NULL),
PANEL_TYPE("removable-media", cc_removable_media_panel_get_type, NULL),
+ PANEL_TYPE("screen", cc_screen_panel_get_type, NULL),
PANEL_TYPE("search", cc_search_panel_get_type, NULL),
PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL),
PANEL_TYPE("sound", cc_sound_panel_get_type, NULL),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
