[gnome-control-center] universal-access: Rename ZoomOptions to standard CcZoomOptionsDialog
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] universal-access: Rename ZoomOptions to standard CcZoomOptionsDialog
- Date: Wed, 11 Nov 2020 20:06:45 +0000 (UTC)
commit 88b9b2a149822e004e78f61432a7d6da5911534e
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Nov 2 15:35:21 2020 +1300
universal-access: Rename ZoomOptions to standard CcZoomOptionsDialog
panels/universal-access/cc-ua-panel.c | 16 +--
.../{zoom-options.c => cc-zoom-options-dialog.c} | 114 ++++++++++-----------
.../{zoom-options.h => cc-zoom-options-dialog.h} | 6 +-
.../{zoom-options.ui => cc-zoom-options-dialog.ui} | 10 +-
panels/universal-access/meson.build | 4 +-
.../universal-access.gresource.xml | 2 +-
po/POTFILES.in | 4 +-
7 files changed, 77 insertions(+), 79 deletions(-)
---
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 8aa653126..71f61dae0 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -31,7 +31,7 @@
#include "cc-ua-panel.h"
#include "cc-ua-resources.h"
-#include "zoom-options.h"
+#include "cc-zoom-options-dialog.h"
#define DPI_FACTOR_LARGE 1.25
#define DPI_FACTOR_NORMAL 1.0
@@ -192,7 +192,7 @@ struct _CcUaPanel
GSettings *application_settings;
GSettings *gsd_mouse_settings;
- ZoomOptions *zoom_options;
+ CcZoomOptionsDialog *zoom_options_dialog;
GtkAdjustment *focus_adjustment;
@@ -209,7 +209,7 @@ cc_ua_panel_dispose (GObject *object)
{
CcUaPanel *self = CC_UA_PANEL (object);
- g_clear_pointer ((GtkWidget **)&self->zoom_options, gtk_widget_destroy);
+ g_clear_pointer ((GtkWidget **)&self->zoom_options_dialog, gtk_widget_destroy);
g_slist_free_full (self->toplevels, (GDestroyNotify)gtk_widget_destroy);
self->toplevels = NULL;
@@ -327,15 +327,15 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
/* zoom options dialog */
static void
-zoom_options_launch (CcUaPanel *self)
+zoom_options_dialog_launch (CcUaPanel *self)
{
- if (self->zoom_options == NULL)
+ if (self->zoom_options_dialog == NULL)
{
GtkWindow *window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self)));
- self->zoom_options = zoom_options_new (window);
+ self->zoom_options_dialog = cc_zoom_options_dialog_new (window);
}
- gtk_window_present_with_time (GTK_WINDOW (self->zoom_options), GDK_CURRENT_TIME);
+ gtk_window_present_with_time (GTK_WINDOW (self->zoom_options_dialog), GDK_CURRENT_TIME);
}
/* cursor size dialog */
@@ -634,7 +634,7 @@ activate_row (CcUaPanel *self, GtkListBoxRow *row)
}
else if (row == self->row_zoom)
{
- zoom_options_launch (self);
+ zoom_options_dialog_launch (self);
}
else if (row == self->row_cursor_size)
{
diff --git a/panels/universal-access/zoom-options.c b/panels/universal-access/cc-zoom-options-dialog.c
similarity index 80%
rename from panels/universal-access/zoom-options.c
rename to panels/universal-access/cc-zoom-options-dialog.c
index c7aee198c..d47606c24 100644
--- a/panels/universal-access/zoom-options.c
+++ b/panels/universal-access/cc-zoom-options-dialog.c
@@ -18,7 +18,7 @@
* Author: Joseph Scheuhammer <clown alum mit edu>
*/
-#include "zoom-options.h"
+#include "cc-zoom-options-dialog.h"
#include <gdk/gdk.h>
#include <glib/gi18n.h>
#include <string.h>
@@ -26,7 +26,7 @@
#define POSITION_MODEL_VALUE_COLUMN 2
#define FONT_SCALE 1.25
-struct _ZoomOptions
+struct _CcZoomOptionsDialog
{
GtkDialog parent;
@@ -53,7 +53,7 @@ struct _ZoomOptions
GtkWidget *inverse_enabled_switch;
};
-G_DEFINE_TYPE (ZoomOptions, zoom_options, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (CcZoomOptionsDialog, cc_zoom_options_dialog, GTK_TYPE_DIALOG);
static gchar *brightness_keys[] = {
"brightness-red",
@@ -69,16 +69,16 @@ static gchar *contrast_keys[] = {
NULL
};
-static void set_enable_screen_part_ui (ZoomOptions *self);
+static void set_enable_screen_part_ui (CcZoomOptionsDialog *self);
static void scale_label (GtkBin *toggle, PangoAttrList *attrs);
-static void xhairs_length_add_marks (ZoomOptions *self, GtkScale *scale);
+static void xhairs_length_add_marks (CcZoomOptionsDialog *self, GtkScale *scale);
static void effects_slider_set_value (GtkRange *slider, GSettings *settings);
-static void brightness_slider_notify_cb (ZoomOptions *self, const gchar *key);
-static void contrast_slider_notify_cb (ZoomOptions *self, const gchar *key);
-static void effects_slider_changed (ZoomOptions *self, GtkRange *slider);
+static void brightness_slider_notify_cb (CcZoomOptionsDialog *self, const gchar *key);
+static void contrast_slider_notify_cb (CcZoomOptionsDialog *self, const gchar *key);
+static void effects_slider_changed (CcZoomOptionsDialog *self, GtkRange *slider);
static void
-mouse_tracking_radio_toggled_cb (ZoomOptions *self, GtkWidget *widget)
+mouse_tracking_radio_toggled_cb (CcZoomOptionsDialog *self, GtkWidget *widget)
{
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
return;
@@ -92,7 +92,7 @@ mouse_tracking_radio_toggled_cb (ZoomOptions *self, GtkWidget *widget)
}
static void
-mouse_tracking_notify_cb (ZoomOptions *self)
+mouse_tracking_notify_cb (CcZoomOptionsDialog *self)
{
g_autofree gchar *tracking = NULL;
@@ -106,7 +106,7 @@ mouse_tracking_notify_cb (ZoomOptions *self)
}
static void
-init_screen_part_section (ZoomOptions *self, PangoAttrList *pango_attrs)
+init_screen_part_section (CcZoomOptionsDialog *self, PangoAttrList *pango_attrs)
{
gboolean lens_mode;
@@ -141,7 +141,7 @@ init_screen_part_section (ZoomOptions *self, PangoAttrList *pango_attrs)
}
static void
-set_enable_screen_part_ui (ZoomOptions *self)
+set_enable_screen_part_ui (CcZoomOptionsDialog *self)
{
gboolean screen_part;
@@ -171,7 +171,7 @@ scale_label (GtkBin *toggle, PangoAttrList *attrs)
}
static void
-screen_position_combo_changed_cb (ZoomOptions *self)
+screen_position_combo_changed_cb (CcZoomOptionsDialog *self)
{
g_autofree gchar *combo_value = NULL;
GtkTreeIter iter;
@@ -189,7 +189,7 @@ screen_position_combo_changed_cb (ZoomOptions *self)
}
static void
-screen_position_notify_cb (ZoomOptions *self,
+screen_position_notify_cb (CcZoomOptionsDialog *self,
const gchar *key)
{
g_autofree gchar *position = NULL;
@@ -239,13 +239,13 @@ init_xhairs_color_opacity (GtkColorButton *color_button, GSettings *settings)
}
static void
-xhairs_color_notify_cb (ZoomOptions *self)
+xhairs_color_notify_cb (CcZoomOptionsDialog *self)
{
init_xhairs_color_opacity (GTK_COLOR_BUTTON (self->crosshair_picker_color_button), self->settings);
}
static void
-xhairs_opacity_notify_cb (ZoomOptions *self, gchar *key)
+xhairs_opacity_notify_cb (CcZoomOptionsDialog *self, gchar *key)
{
GdkRGBA rgba;
gdouble opacity;
@@ -258,7 +258,7 @@ xhairs_opacity_notify_cb (ZoomOptions *self, gchar *key)
#define TO_HEX(x) (int) ((gdouble) x * 255.0)
static void
-xhairs_color_opacity_changed (ZoomOptions *self)
+xhairs_color_opacity_changed (CcZoomOptionsDialog *self)
{
GdkRGBA rgba;
g_autofree gchar *color_string = NULL;
@@ -274,7 +274,7 @@ xhairs_color_opacity_changed (ZoomOptions *self)
g_settings_set_double (self->settings, "cross-hairs-opacity", rgba.alpha);
}
-static void xhairs_length_add_marks (ZoomOptions *self, GtkScale *scale)
+static void xhairs_length_add_marks (CcZoomOptionsDialog *self, GtkScale *scale)
{
GtkAdjustment *scale_model;
GdkRectangle rect;
@@ -309,7 +309,7 @@ static void xhairs_length_add_marks (ZoomOptions *self, GtkScale *scale)
static void
init_effects_slider (GtkRange *slider,
- ZoomOptions *self,
+ CcZoomOptionsDialog *self,
gchar **keys,
GCallback notify_cb)
{
@@ -352,7 +352,7 @@ effects_slider_set_value (GtkRange *slider, GSettings *settings)
}
static void
-brightness_slider_notify_cb (ZoomOptions *self,
+brightness_slider_notify_cb (CcZoomOptionsDialog *self,
const gchar *key)
{
GtkRange *slider = GTK_RANGE (self->brightness_slider);
@@ -363,7 +363,7 @@ brightness_slider_notify_cb (ZoomOptions *self,
}
static void
-contrast_slider_notify_cb (ZoomOptions *self,
+contrast_slider_notify_cb (CcZoomOptionsDialog *self,
const gchar *key)
{
GtkRange *slider = GTK_RANGE (self->contrast_slider);
@@ -374,7 +374,7 @@ contrast_slider_notify_cb (ZoomOptions *self,
}
static void
-effects_slider_changed (ZoomOptions *self, GtkRange *slider)
+effects_slider_changed (CcZoomOptionsDialog *self, GtkRange *slider)
{
gchar **keys, **key;
gdouble value;
@@ -389,15 +389,15 @@ effects_slider_changed (ZoomOptions *self, GtkRange *slider)
}
static void
-zoom_options_constructed (GObject *object)
+cc_zoom_options_dialog_constructed (GObject *object)
{
PangoAttribute *attr;
PangoAttrList *pango_attrs;
- ZoomOptions *self;
+ CcZoomOptionsDialog *self;
- self = ZOOM_OPTIONS (object);
+ self = CC_ZOOM_OPTIONS_DIALOG (object);
- G_OBJECT_CLASS (zoom_options_parent_class)->constructed (object);
+ G_OBJECT_CLASS (cc_zoom_options_dialog_parent_class)->constructed (object);
pango_attrs = pango_attr_list_new ();
attr = pango_attr_scale_new (FONT_SCALE);
@@ -478,51 +478,51 @@ zoom_options_constructed (GObject *object)
}
static void
-zoom_options_finalize (GObject *object)
+cc_zoom_options_dialog_finalize (GObject *object)
{
- ZoomOptions *self = ZOOM_OPTIONS (object);
+ CcZoomOptionsDialog *self = CC_ZOOM_OPTIONS_DIALOG (object);
g_clear_object (&self->settings);
g_clear_object (&self->application_settings);
- G_OBJECT_CLASS (zoom_options_parent_class)->finalize (object);
+ G_OBJECT_CLASS (cc_zoom_options_dialog_parent_class)->finalize (object);
}
static void
-zoom_options_class_init (ZoomOptionsClass *klass)
+cc_zoom_options_dialog_class_init (CcZoomOptionsDialogClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- object_class->finalize = zoom_options_finalize;
- object_class->constructed = zoom_options_constructed;
-
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/universal-access/zoom-options.ui");
-
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, brightness_slider);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, centered_radio);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, contrast_slider);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, crosshair_clip_checkbox);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, crosshair_enabled_switcher);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, crosshair_length_slider);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, crosshair_picker_color_button);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, crosshair_thickness_scale);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, extend_beyond_checkbox);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, follow_mouse_radio);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, grayscale_slider);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, inverse_enabled_switch);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, magnifier_factor_spin);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, proportional_radio);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, push_radio);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, screen_part_radio);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, screen_position_combobox);
- gtk_widget_class_bind_template_child (widget_class, ZoomOptions, seeing_zoom_switch);
+ object_class->finalize = cc_zoom_options_dialog_finalize;
+ object_class->constructed = cc_zoom_options_dialog_constructed;
+
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/universal-access/cc-zoom-options-dialog.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, brightness_slider);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, centered_radio);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, contrast_slider);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, crosshair_clip_checkbox);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, crosshair_enabled_switcher);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, crosshair_length_slider);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, crosshair_picker_color_button);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, crosshair_thickness_scale);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, extend_beyond_checkbox);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, follow_mouse_radio);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, grayscale_slider);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, inverse_enabled_switch);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, magnifier_factor_spin);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, proportional_radio);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, push_radio);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, screen_part_radio);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, screen_position_combobox);
+ gtk_widget_class_bind_template_child (widget_class, CcZoomOptionsDialog, seeing_zoom_switch);
gtk_widget_class_bind_template_callback (widget_class, mouse_tracking_radio_toggled_cb);
}
static void
-zoom_options_init (ZoomOptions *self)
+cc_zoom_options_dialog_init (CcZoomOptionsDialog *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
@@ -530,10 +530,10 @@ zoom_options_init (ZoomOptions *self)
self->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");
}
-ZoomOptions *
-zoom_options_new (GtkWindow *parent)
+CcZoomOptionsDialog *
+cc_zoom_options_dialog_new (GtkWindow *parent)
{
- return g_object_new (ZOOM_TYPE_OPTIONS,
+ return g_object_new (cc_zoom_options_dialog_get_type (),
"transient-for", parent,
"use-header-bar", TRUE,
NULL);
diff --git a/panels/universal-access/zoom-options.h b/panels/universal-access/cc-zoom-options-dialog.h
similarity index 83%
rename from panels/universal-access/zoom-options.h
rename to panels/universal-access/cc-zoom-options-dialog.h
index ea82b22bb..f64cf8390 100644
--- a/panels/universal-access/zoom-options.h
+++ b/panels/universal-access/cc-zoom-options-dialog.h
@@ -24,10 +24,8 @@
G_BEGIN_DECLS
-#define ZOOM_TYPE_OPTIONS (zoom_options_get_type())
+G_DECLARE_FINAL_TYPE (CcZoomOptionsDialog, cc_zoom_options_dialog, CC, ZOOM_OPTIONS_DIALOG, GtkDialog)
-G_DECLARE_FINAL_TYPE (ZoomOptions, zoom_options, ZOOM, OPTIONS, GtkDialog)
-
-ZoomOptions *zoom_options_new (GtkWindow *parent);
+CcZoomOptionsDialog *cc_zoom_options_dialog_new (GtkWindow *parent);
G_END_DECLS
diff --git a/panels/universal-access/zoom-options.ui b/panels/universal-access/cc-zoom-options-dialog.ui
similarity index 99%
rename from panels/universal-access/zoom-options.ui
rename to panels/universal-access/cc-zoom-options-dialog.ui
index cd1908187..cfdacb7f9 100644
--- a/panels/universal-access/zoom-options.ui
+++ b/panels/universal-access/cc-zoom-options-dialog.ui
@@ -71,14 +71,14 @@
</row>
</data>
</object>
- <template class="ZoomOptions" parent="GtkDialog">
+ <template class="CcZoomOptionsDialog" parent="GtkDialog">
<property name="modal">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Zoom Options</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
- <signal name="delete-event" handler="gtk_widget_hide_on_delete" object="ZoomOptions" swapped="no" />
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" object="CcZoomOptionsDialog"
swapped="no" />
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
@@ -357,7 +357,7 @@
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="use_underline">True</property>
- <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="ZoomOptions" swapped="yes"/>
+ <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="CcZoomOptionsDialog" swapped="yes"/>
</object>
<packing>
<property name="expand">False</property>
@@ -377,7 +377,7 @@
<property name="draw_indicator">True</property>
<property name="group">centered_radio</property>
<property name="use_underline">True</property>
- <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="ZoomOptions" swapped="yes"/>
+ <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="CcZoomOptionsDialog" swapped="yes"/>
</object>
<packing>
<property name="expand">False</property>
@@ -397,7 +397,7 @@
<property name="draw_indicator">True</property>
<property name="group">centered_radio</property>
<property name="use_underline">True</property>
- <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="ZoomOptions" swapped="yes"/>
+ <signal name="toggled" handler="mouse_tracking_radio_toggled_cb"
object="CcZoomOptionsDialog" swapped="yes"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build
index fbc25813e..ce6041ccb 100644
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -19,7 +19,7 @@ i18n.merge_file(
sources = files(
'cc-ua-panel.c',
- 'zoom-options.c'
+ 'cc-zoom-options-dialog.c'
)
resource_data = files(
@@ -29,7 +29,7 @@ resource_data = files(
'left_ptr_48px.png',
'left_ptr_64px.png',
'left_ptr_96px.png',
- 'zoom-options.ui'
+ 'cc-zoom-options-dialog.ui'
)
sources += gnome.compile_resources(
diff --git a/panels/universal-access/universal-access.gresource.xml
b/panels/universal-access/universal-access.gresource.xml
index dde0edc17..0f6055619 100644
--- a/panels/universal-access/universal-access.gresource.xml
+++ b/panels/universal-access/universal-access.gresource.xml
@@ -2,7 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/control-center/universal-access">
<file preprocess="xml-stripblanks">cc-ua-panel.ui</file>
- <file preprocess="xml-stripblanks">zoom-options.ui</file>
+ <file preprocess="xml-stripblanks">cc-zoom-options-dialog.ui</file>
<file>left_ptr_24px.png</file>
<file>left_ptr_32px.png</file>
<file>left_ptr_48px.png</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b5ab2696f..d6d567042 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -217,9 +217,9 @@ panels/thunderbolt/cc-bolt-panel.ui
panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
panels/universal-access/cc-ua-panel.c
panels/universal-access/cc-ua-panel.ui
+panels/universal-access/cc-zoom-options-dialog.c
+panels/universal-access/cc-zoom-options-dialog.ui
panels/universal-access/gnome-universal-access-panel.desktop.in.in
-panels/universal-access/zoom-options.c
-panels/universal-access/zoom-options.ui
panels/usage/cc-usage-panel.c
panels/usage/cc-usage-panel.ui
panels/usage/gnome-usage-panel.desktop.in.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]