gnome: rename video settings to media settings
Audio and video settings are now in the same panel.
Refs #71866
Change-Id: I5e9906b42a1160f985578438d363706c7d399548
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8085846..20d94b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,8 +191,8 @@
src/video/xrectsel.c
src/dialogs.h
src/dialogs.c
- src/videosettingsview.h
- src/videosettingsview.cpp
+ src/mediasettingsview.h
+ src/mediasettingsview.cpp
src/backends/edscontactbackend.h
src/backends/edscontactbackend.cpp
src/delegates/pixbufdelegate.h
diff --git a/src/videosettingsview.cpp b/src/mediasettingsview.cpp
similarity index 88%
rename from src/videosettingsview.cpp
rename to src/mediasettingsview.cpp
index 336caf5..c216462 100644
--- a/src/videosettingsview.cpp
+++ b/src/mediasettingsview.cpp
@@ -28,7 +28,7 @@
* as that of the covered work.
*/
-#include "videosettingsview.h"
+#include "mediasettingsview.h"
#include <gtk/gtk.h>
#include "models/gtkqtreemodel.h"
@@ -43,19 +43,19 @@
#include <audio/inputdevicemodel.h>
#include <audio/ringtonedevicemodel.h>
-struct _VideoSettingsView
+struct _MediaSettingsView
{
GtkBox parent;
};
-struct _VideoSettingsViewClass
+struct _MediaSettingsViewClass
{
GtkBoxClass parent_class;
};
-typedef struct _VideoSettingsViewPrivate VideoSettingsViewPrivate;
+typedef struct _MediaSettingsViewPrivate MediaSettingsViewPrivate;
-struct _VideoSettingsViewPrivate
+struct _MediaSettingsViewPrivate
{
/* audio settings */
GtkWidget *combobox_manager;
@@ -89,15 +89,15 @@
QMetaObject::Connection rate_selection;
};
-G_DEFINE_TYPE_WITH_PRIVATE(VideoSettingsView, video_settings_view, GTK_TYPE_BOX);
+G_DEFINE_TYPE_WITH_PRIVATE(MediaSettingsView, media_settings_view, GTK_TYPE_BOX);
-#define VIDEO_SETTINGS_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), VIDEO_SETTINGS_VIEW_TYPE, VideoSettingsViewPrivate))
+#define MEDIA_SETTINGS_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MEDIA_SETTINGS_VIEW_TYPE, MediaSettingsViewPrivate))
static void
-video_settings_view_dispose(GObject *object)
+media_settings_view_dispose(GObject *object)
{
- VideoSettingsView *view = VIDEO_SETTINGS_VIEW(object);
- VideoSettingsViewPrivate *priv = VIDEO_SETTINGS_VIEW_GET_PRIVATE(view);
+ MediaSettingsView *view = MEDIA_SETTINGS_VIEW(object);
+ MediaSettingsViewPrivate *priv = MEDIA_SETTINGS_VIEW_GET_PRIVATE(view);
/* make sure to stop the preview if this view is getting destroyed */
if (priv->video_started_by_settings) {
@@ -116,7 +116,7 @@
QObject::disconnect(priv->resolution_selection);
QObject::disconnect(priv->rate_selection);
- G_OBJECT_CLASS(video_settings_view_parent_class)->dispose(object);
+ G_OBJECT_CLASS(media_settings_view_parent_class)->dispose(object);
}
static QModelIndex
@@ -189,11 +189,11 @@
}
static void
-video_settings_view_init(VideoSettingsView *view)
+media_settings_view_init(MediaSettingsView *view)
{
gtk_widget_init_template(GTK_WIDGET(view));
- VideoSettingsViewPrivate *priv = VIDEO_SETTINGS_VIEW_GET_PRIVATE(view);
+ MediaSettingsViewPrivate *priv = MEDIA_SETTINGS_VIEW_GET_PRIVATE(view);
priv->device_selection = connect_combo_box_qmodel(GTK_COMBO_BOX(priv->combobox_device),
Video::ConfigurationProxy::deviceModel(),
@@ -231,37 +231,37 @@
}
static void
-video_settings_view_class_init(VideoSettingsViewClass *klass)
+media_settings_view_class_init(MediaSettingsViewClass *klass)
{
- G_OBJECT_CLASS(klass)->dispose = video_settings_view_dispose;
+ G_OBJECT_CLASS(klass)->dispose = media_settings_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
- "/cx/ring/RingGnome/videosettingsview.ui");
+ "/cx/ring/RingGnome/mediasettingsview.ui");
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_manager);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_ringtone);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_output);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_input);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_device);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_channel);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_resolution);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, combobox_framerate);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), VideoSettingsView, hbox_camera);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_manager);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_ringtone);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_output);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_input);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_device);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_channel);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_resolution);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_framerate);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, hbox_camera);
}
GtkWidget *
-video_settings_view_new()
+media_settings_view_new()
{
- gpointer view = g_object_new(VIDEO_SETTINGS_VIEW_TYPE, NULL);
+ gpointer view = g_object_new(MEDIA_SETTINGS_VIEW_TYPE, NULL);
return (GtkWidget *)view;
}
void
-video_settings_show_preview(VideoSettingsView *self, gboolean show_preview)
+media_settings_view_show_preview(MediaSettingsView *self, gboolean show_preview)
{
- g_return_if_fail(IS_VIDEO_SETTINGS_VIEW(self));
- VideoSettingsViewPrivate *priv = VIDEO_SETTINGS_VIEW_GET_PRIVATE(self);
+ g_return_if_fail(IS_MEDIA_SETTINGS_VIEW(self));
+ MediaSettingsViewPrivate *priv = MEDIA_SETTINGS_VIEW_GET_PRIVATE(self);
/* if TRUE, create a VideoWidget, then check if the preview has already been
* started (because a call was in progress); if not, then start it.
diff --git a/src/videosettingsview.h b/src/mediasettingsview.h
similarity index 62%
rename from src/videosettingsview.h
rename to src/mediasettingsview.h
index e5572c6..735082c 100644
--- a/src/videosettingsview.h
+++ b/src/mediasettingsview.h
@@ -28,26 +28,26 @@
* as that of the covered work.
*/
-#ifndef _VIDEOSETTINGSVIEW_H
-#define _VIDEOSETTINGSVIEW_H
+#ifndef _MEDIASETTINGSVIEW_H
+#define _MEDIASETTINGSVIEW_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define VIDEO_SETTINGS_VIEW_TYPE (video_settings_view_get_type ())
-#define VIDEO_SETTINGS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIDEO_SETTINGS_VIEW_TYPE, VideoSettingsView))
-#define VIDEO_SETTINGS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIDEO_SETTINGS_VIEW_TYPE, VideoSettingsViewClass))
-#define IS_VIDEO_SETTINGS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIDEO_SETTINGS_VIEW_TYPE))
-#define IS_VIDEO_SETTINGS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIDEO_SETTINGS_VIEW_TYPE))
+#define MEDIA_SETTINGS_VIEW_TYPE (media_settings_view_get_type ())
+#define MEDIA_SETTINGS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MEDIA_SETTINGS_VIEW_TYPE, MediaSettingsView))
+#define MEDIA_SETTINGS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), MEDIA_SETTINGS_VIEW_TYPE, MediaSettingsViewClass))
+#define IS_MEDIA_SETTINGS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), MEDIA_SETTINGS_VIEW_TYPE))
+#define IS_MEDIA_SETTINGS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), MEDIA_SETTINGS_VIEW_TYPE))
-typedef struct _VideoSettingsView VideoSettingsView;
-typedef struct _VideoSettingsViewClass VideoSettingsViewClass;
+typedef struct _MediaSettingsView MediaSettingsView;
+typedef struct _MediaSettingsViewClass MediaSettingsViewClass;
-GType video_settings_view_get_type (void) G_GNUC_CONST;
-GtkWidget *video_settings_view_new (void);
-void video_settings_show_preview (VideoSettingsView *self, gboolean show_preview);
+GType media_settings_view_get_type (void) G_GNUC_CONST;
+GtkWidget *media_settings_view_new (void);
+void media_settings_view_show_preview (MediaSettingsView *self, gboolean show_preview);
G_END_DECLS
-#endif /* _VIDEOSETTINGSVIEW_H */
\ No newline at end of file
+#endif /* _MEDIASETTINGSVIEW_H */
\ No newline at end of file
diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index 8e7bf5f..2458c42 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -45,7 +45,7 @@
#include <accountmodel.h>
#include <audio/codecmodel.h>
#include "dialogs.h"
-#include "videosettingsview.h"
+#include "mediasettingsview.h"
#include <video/previewmanager.h>
#include <personmodel.h>
#include "utils/drawing.h"
@@ -101,7 +101,7 @@
GtkWidget *stack_call_view;
GtkWidget *button_placecall;
GtkWidget *account_settings_view;
- GtkWidget *video_settings_view;
+ GtkWidget *media_settings_view;
GtkWidget *last_settings_view;
GtkWidget *radiobutton_general_settings;
GtkWidget *radiobutton_media_settings;
@@ -411,8 +411,8 @@
gtk_widget_show(priv->hbox_settings);
/* make sure to start preview if we're showing the video settings */
- if (priv->last_settings_view == priv->video_settings_view)
- video_settings_show_preview(VIDEO_SETTINGS_VIEW(priv->video_settings_view), TRUE);
+ if (priv->last_settings_view == priv->media_settings_view)
+ media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), TRUE);
gtk_stack_set_transition_type(GTK_STACK(priv->stack_main_view), GTK_STACK_TRANSITION_TYPE_SLIDE_UP);
gtk_stack_set_visible_child(GTK_STACK(priv->stack_main_view), priv->last_settings_view);
@@ -437,7 +437,7 @@
gtk_stack_set_visible_child_name(GTK_STACK(priv->stack_main_view), CALL_VIEW_NAME);
/* make sure video preview is stopped, in case it was started */
- video_settings_show_preview(VIDEO_SETTINGS_VIEW(priv->video_settings_view), FALSE);
+ media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), FALSE);
}
}
@@ -448,12 +448,12 @@
RingMainWindowPrivate *priv = RING_MAIN_WINDOW_GET_PRIVATE(win);
if (gtk_toggle_button_get_active(navbutton)) {
- video_settings_show_preview(VIDEO_SETTINGS_VIEW(priv->video_settings_view), TRUE);
+ media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), TRUE);
gtk_stack_set_transition_type(GTK_STACK(priv->stack_main_view), GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT);
gtk_stack_set_visible_child_name(GTK_STACK(priv->stack_main_view), MEDIA_SETTINGS_VIEW_NAME);
- priv->last_settings_view = priv->video_settings_view;
+ priv->last_settings_view = priv->media_settings_view;
} else {
- video_settings_show_preview(VIDEO_SETTINGS_VIEW(priv->video_settings_view), FALSE);
+ media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), FALSE);
}
}
@@ -942,12 +942,12 @@
priv->account_settings_view = account_view_new();
gtk_stack_add_named(GTK_STACK(priv->stack_main_view), priv->account_settings_view, ACCOUNT_SETTINGS_VIEW_NAME);
- priv->video_settings_view = video_settings_view_new();
- gtk_stack_add_named(GTK_STACK(priv->stack_main_view), priv->video_settings_view, MEDIA_SETTINGS_VIEW_NAME);
+ priv->media_settings_view = media_settings_view_new();
+ gtk_stack_add_named(GTK_STACK(priv->stack_main_view), priv->media_settings_view, MEDIA_SETTINGS_VIEW_NAME);
/* make the setting we will show first the active one */
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->radiobutton_media_settings), TRUE);
- priv->last_settings_view = priv->video_settings_view;
+ priv->last_settings_view = priv->media_settings_view;
/* connect the settings button signals to switch settings views */
g_signal_connect(priv->radiobutton_media_settings, "toggled", G_CALLBACK(show_media_settings), win);
diff --git a/ui/videosettingsview.ui b/ui/mediasettingsview.ui
similarity index 99%
rename from ui/videosettingsview.ui
rename to ui/mediasettingsview.ui
index 3278cb7..d143ccd 100644
--- a/ui/videosettingsview.ui
+++ b/ui/mediasettingsview.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.10"/>
- <template class="VideoSettingsView" parent="GtkBox">
+ <template class="MediaSettingsView" parent="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
diff --git a/ui/ui.gresource.xml b/ui/ui.gresource.xml
index 73cc171..dacadd8 100644
--- a/ui/ui.gresource.xml
+++ b/ui/ui.gresource.xml
@@ -9,7 +9,7 @@
<file preprocess="xml-stripblanks">accountgeneraltab.ui</file>
<file preprocess="xml-stripblanks">accountaudiotab.ui</file>
<file preprocess="xml-stripblanks">accountvideotab.ui</file>
- <file preprocess="xml-stripblanks">videosettingsview.ui</file>
+ <file preprocess="xml-stripblanks">mediasettingsview.ui</file>
<file preprocess="xml-stripblanks">accountadvancedtab.ui</file>
</gresource>
</gresources>
\ No newline at end of file