GNOME.org
 

[tepl] Rename TeplHighlightModeSelector class to TeplLanguageChooserWidget

commit 558b7b1a0a3a010f79e09fa2f20bf6411d4f8e6c
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Oct 31 23:35:35 2020 +0100

    Rename TeplHighlightModeSelector class to TeplLanguageChooserWidget
    
    A next commit will implement the TeplLanguageChooser interface.

 docs/reference/tepl-docs.xml                       |  2 +-
 docs/reference/tepl-sections.txt                   | 32 ++++----
 po/POTFILES.in                                     |  2 +-
 tepl/meson.build                                   |  4 +-
 tepl/tepl-highlight-mode-selector.h                | 55 -------------
 ...e-selector.c => tepl-language-chooser-widget.c} | 96 +++++++++++-----------
 tepl/tepl-language-chooser-widget.h                | 55 +++++++++++++
 tepl/tepl.h                                        |  2 +-
 tests/meson.build                                  |  2 +-
 ...e-selector.c => test-language-chooser-widget.c} | 10 +--
 10 files changed, 130 insertions(+), 130 deletions(-)
---
diff --git a/docs/reference/tepl-docs.xml b/docs/reference/tepl-docs.xml
index 401315e..bef4d0d 100644
--- a/docs/reference/tepl-docs.xml
+++ b/docs/reference/tepl-docs.xml
@@ -64,7 +64,7 @@
     <chapter id="language-choosers">
       <title>Language Choosers</title>
       <xi:include href="xml/language-chooser.xml"/>
-      <xi:include href="xml/highlight-mode-selector.xml"/>
+      <xi:include href="xml/language-chooser-widget.xml"/>
     </chapter>
 
     <chapter id="misc">
diff --git a/docs/reference/tepl-sections.txt b/docs/reference/tepl-sections.txt
index 1052d29..d4d04ba 100644
--- a/docs/reference/tepl-sections.txt
+++ b/docs/reference/tepl-sections.txt
@@ -232,22 +232,6 @@ TEPL_TYPE_GUTTER_RENDERER_FOLDS_STATE
 tepl_gutter_renderer_folds_state_get_type
 </SECTION>
 
-<SECTION>
-<FILE>highlight-mode-selector</FILE>
-TeplHighlightModeSelector
-tepl_highlight_mode_selector_new
-<SUBSECTION Standard>
-TEPL_HIGHLIGHT_MODE_SELECTOR
-TEPL_HIGHLIGHT_MODE_SELECTOR_CLASS
-TEPL_HIGHLIGHT_MODE_SELECTOR_GET_CLASS
-TEPL_IS_HIGHLIGHT_MODE_SELECTOR
-TEPL_IS_HIGHLIGHT_MODE_SELECTOR_CLASS
-TEPL_TYPE_HIGHLIGHT_MODE_SELECTOR
-TeplHighlightModeSelectorClass
-TeplHighlightModeSelectorPrivate
-tepl_highlight_mode_selector_get_type
-</SECTION>
-
 <SECTION>
 <FILE>info-bar</FILE>
 TeplInfoBar
@@ -291,6 +275,22 @@ TEPL_TYPE_LANGUAGE_CHOOSER
 tepl_language_chooser_get_type
 </SECTION>
 
+<SECTION>
+<FILE>language-chooser-widget</FILE>
+TeplLanguageChooserWidget
+tepl_language_chooser_widget_new
+<SUBSECTION Standard>
+TEPL_LANGUAGE_CHOOSER_WIDGET
+TEPL_LANGUAGE_CHOOSER_WIDGET_CLASS
+TEPL_LANGUAGE_CHOOSER_WIDGET_GET_CLASS
+TEPL_IS_LANGUAGE_CHOOSER_WIDGET
+TEPL_IS_LANGUAGE_CHOOSER_WIDGET_CLASS
+TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET
+TeplLanguageChooserWidgetClass
+TeplLanguageChooserWidgetPrivate
+tepl_language_chooser_widget_get_type
+</SECTION>
+
 <SECTION>
 <FILE>menu-shell</FILE>
 tepl_menu_shell_append_edit_actions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a5d889a..1c4eb21 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,13 +9,13 @@ tepl/tepl-file-chooser.c
 tepl/tepl-file-loader.c
 tepl/tepl-file-saver.c
 tepl/tepl-goto-line-bar.c
-tepl/tepl-highlight-mode-selector.c
 tepl/tepl-icu.c
 tepl/tepl-info-bar.c
 tepl/tepl-init.c
 tepl/tepl-io-error-info-bars.c
 tepl/tepl-iter.c
 tepl/tepl-language-chooser.c
+tepl/tepl-language-chooser-widget.c
 tepl/tepl-menu-shell.c
 tepl/tepl-metadata-attic.c
 tepl/tepl-metadata.c
diff --git a/tepl/meson.build b/tepl/meson.build
index 6be7ec8..39d5beb 100644
--- a/tepl/meson.build
+++ b/tepl/meson.build
@@ -11,12 +11,12 @@ tepl_public_headers = [
   'tepl-fold-region.h',
   'tepl-goto-line-bar.h',
   'tepl-gutter-renderer-folds.h',
-  'tepl-highlight-mode-selector.h',
   'tepl-info-bar.h',
   'tepl-init.h',
   'tepl-io-error-info-bars.h',
   'tepl-iter.h',
   'tepl-language-chooser.h',
+  'tepl-language-chooser-widget.h',
   'tepl-macros.h',
   'tepl-menu-shell.h',
   'tepl-metadata.h',
@@ -48,12 +48,12 @@ tepl_public_c_files = [
   'tepl-fold-region.c',
   'tepl-goto-line-bar.c',
   'tepl-gutter-renderer-folds.c',
-  'tepl-highlight-mode-selector.c',
   'tepl-info-bar.c',
   'tepl-init.c',
   'tepl-io-error-info-bars.c',
   'tepl-iter.c',
   'tepl-language-chooser.c',
+  'tepl-language-chooser-widget.c',
   'tepl-menu-shell.c',
   'tepl-metadata.c',
   'tepl-metadata-manager.c',
diff --git a/tepl/tepl-highlight-mode-selector.c b/tepl/tepl-language-chooser-widget.c
similarity index 61%
rename from tepl/tepl-highlight-mode-selector.c
rename to tepl/tepl-language-chooser-widget.c
index 545621a..9804f84 100644
--- a/tepl/tepl-highlight-mode-selector.c
+++ b/tepl/tepl-language-chooser-widget.c
@@ -2,15 +2,15 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-#include "tepl-highlight-mode-selector.h"
+#include "tepl-language-chooser-widget.h"
 
 /**
- * SECTION:highlight-mode-selector
- * @Title: TeplHighlightModeSelector
- * @Short_description: A widget for selecting a #GtkSourceLanguage
+ * SECTION:language-chooser-widget
+ * @Title: TeplLanguageChooserWidget
+ * @Short_description: A widget for choosing a #GtkSourceLanguage
  */
 
-struct _TeplHighlightModeSelectorPrivate
+struct _TeplLanguageChooserWidgetPrivate
 {
        GtkSearchEntry *search_entry;
        GtkListBox *list_box;
@@ -26,7 +26,7 @@ static guint signals[N_SIGNALS];
 
 #define LIST_BOX_ROW_LANGUAGE_KEY "language-key"
 
-G_DEFINE_TYPE_WITH_PRIVATE (TeplHighlightModeSelector, tepl_highlight_mode_selector, GTK_TYPE_GRID)
+G_DEFINE_TYPE_WITH_PRIVATE (TeplLanguageChooserWidget, tepl_language_chooser_widget, GTK_TYPE_GRID)
 
 static void
 list_box_row_set_language (GtkListBoxRow     *list_box_row,
@@ -46,26 +46,26 @@ list_box_row_get_language (GtkListBoxRow *list_box_row)
 }
 
 static void
-tepl_highlight_mode_selector_dispose (GObject *object)
+tepl_language_chooser_widget_dispose (GObject *object)
 {
-       TeplHighlightModeSelector *selector = TEPL_HIGHLIGHT_MODE_SELECTOR (object);
+       TeplLanguageChooserWidget *chooser_widget = TEPL_LANGUAGE_CHOOSER_WIDGET (object);
 
-       selector->priv->search_entry = NULL;
-       selector->priv->list_box = NULL;
+       chooser_widget->priv->search_entry = NULL;
+       chooser_widget->priv->list_box = NULL;
 
-       G_OBJECT_CLASS (tepl_highlight_mode_selector_parent_class)->dispose (object);
+       G_OBJECT_CLASS (tepl_language_chooser_widget_parent_class)->dispose (object);
 }
 
 static void
-tepl_highlight_mode_selector_class_init (TeplHighlightModeSelectorClass *klass)
+tepl_language_chooser_widget_class_init (TeplLanguageChooserWidgetClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       object_class->dispose = tepl_highlight_mode_selector_dispose;
+       object_class->dispose = tepl_language_chooser_widget_dispose;
 
        /**
-        * TeplHighlightModeSelector::language-selected:
-        * @selector: the #TeplHighlightModeSelector emitting the signal.
+        * TeplLanguageChooserWidget::language-selected:
+        * @chooser_widget: the #TeplLanguageChooserWidget emitting the signal.
         * @language: the #GtkSourceLanguage object that has been selected,
         *   guaranteed to be non-%NULL.
         *
@@ -75,13 +75,13 @@ tepl_highlight_mode_selector_class_init (TeplHighlightModeSelectorClass *klass)
                g_signal_new ("language-selected",
                              G_TYPE_FROM_CLASS (klass),
                              G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (TeplHighlightModeSelectorClass, language_selected),
+                             G_STRUCT_OFFSET (TeplLanguageChooserWidgetClass, language_selected),
                              NULL, NULL, NULL,
                              G_TYPE_NONE, 1, GTK_SOURCE_TYPE_LANGUAGE);
 }
 
 static void
-populate_list_box (TeplHighlightModeSelector *selector)
+populate_list_box (TeplLanguageChooserWidget *chooser_widget)
 {
        GtkSourceLanguageManager *language_manager;
        const gchar * const *language_ids;
@@ -114,7 +114,7 @@ populate_list_box (TeplHighlightModeSelector *selector)
                list_box_row = GTK_LIST_BOX_ROW (gtk_list_box_row_new ());
                list_box_row_set_language (list_box_row, language);
                gtk_container_add (GTK_CONTAINER (list_box_row), GTK_WIDGET (label));
-               gtk_container_add (GTK_CONTAINER (selector->priv->list_box), GTK_WIDGET (list_box_row));
+               gtk_container_add (GTK_CONTAINER (chooser_widget->priv->list_box), GTK_WIDGET (list_box_row));
        }
 }
 
@@ -122,7 +122,7 @@ static gboolean
 filter_cb (GtkListBoxRow *list_box_row,
           gpointer       user_data)
 {
-       TeplHighlightModeSelector *selector = user_data;
+       TeplLanguageChooserWidget *chooser_widget = user_data;
        const gchar *search_text;
        GtkSourceLanguage *language;
        const gchar *language_name;
@@ -132,7 +132,7 @@ filter_cb (GtkListBoxRow *list_box_row,
        gchar *search_text_casefolded;
        gboolean visible;
 
-       search_text = gtk_entry_get_text (GTK_ENTRY (selector->priv->search_entry));
+       search_text = gtk_entry_get_text (GTK_ENTRY (chooser_widget->priv->search_entry));
        if (search_text == NULL || search_text[0] == '\0')
        {
                return TRUE;
@@ -174,15 +174,15 @@ filter_cb (GtkListBoxRow *list_box_row,
 
 static void
 search_changed_cb (GtkSearchEntry            *search_entry,
-                  TeplHighlightModeSelector *selector)
+                  TeplLanguageChooserWidget *chooser_widget)
 {
-       gtk_list_box_invalidate_filter (selector->priv->list_box);
+       gtk_list_box_invalidate_filter (chooser_widget->priv->list_box);
 }
 
 static void
 list_box_row_activated_cb (GtkListBox                *list_box,
                           GtkListBoxRow             *list_box_row,
-                          TeplHighlightModeSelector *selector)
+                          TeplLanguageChooserWidget *chooser_widget)
 {
        GtkSourceLanguage *language;
 
@@ -190,58 +190,58 @@ list_box_row_activated_cb (GtkListBox                *list_box,
        g_return_if_fail (language != NULL);
 
        g_object_ref (language);
-       g_signal_emit (selector, signals[SIGNAL_LANGUAGE_SELECTED], 0, language);
+       g_signal_emit (chooser_widget, signals[SIGNAL_LANGUAGE_SELECTED], 0, language);
        g_object_unref (language);
 }
 
 static void
-tepl_highlight_mode_selector_init (TeplHighlightModeSelector *selector)
+tepl_language_chooser_widget_init (TeplLanguageChooserWidget *chooser_widget)
 {
        GtkWidget *scrolled_window;
 
-       selector->priv = tepl_highlight_mode_selector_get_instance_private (selector);
+       chooser_widget->priv = tepl_language_chooser_widget_get_instance_private (chooser_widget);
 
-       gtk_orientable_set_orientation (GTK_ORIENTABLE (selector), GTK_ORIENTATION_VERTICAL);
+       gtk_orientable_set_orientation (GTK_ORIENTABLE (chooser_widget), GTK_ORIENTATION_VERTICAL);
 
-       selector->priv->search_entry = GTK_SEARCH_ENTRY (gtk_search_entry_new ());
-       gtk_widget_show (GTK_WIDGET (selector->priv->search_entry));
-       gtk_container_add (GTK_CONTAINER (selector), GTK_WIDGET (selector->priv->search_entry));
+       chooser_widget->priv->search_entry = GTK_SEARCH_ENTRY (gtk_search_entry_new ());
+       gtk_widget_show (GTK_WIDGET (chooser_widget->priv->search_entry));
+       gtk_container_add (GTK_CONTAINER (chooser_widget), GTK_WIDGET (chooser_widget->priv->search_entry));
 
-       selector->priv->list_box = GTK_LIST_BOX (gtk_list_box_new ());
-       gtk_list_box_set_activate_on_single_click (selector->priv->list_box, FALSE);
-       populate_list_box (selector);
-       gtk_widget_set_hexpand (GTK_WIDGET (selector->priv->list_box), TRUE);
-       gtk_widget_set_vexpand (GTK_WIDGET (selector->priv->list_box), TRUE);
+       chooser_widget->priv->list_box = GTK_LIST_BOX (gtk_list_box_new ());
+       gtk_list_box_set_activate_on_single_click (chooser_widget->priv->list_box, FALSE);
+       populate_list_box (chooser_widget);
+       gtk_widget_set_hexpand (GTK_WIDGET (chooser_widget->priv->list_box), TRUE);
+       gtk_widget_set_vexpand (GTK_WIDGET (chooser_widget->priv->list_box), TRUE);
 
        scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-       gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (selector->priv->list_box));
+       gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (chooser_widget->priv->list_box));
        gtk_widget_show_all (scrolled_window);
-       gtk_container_add (GTK_CONTAINER (selector), scrolled_window);
+       gtk_container_add (GTK_CONTAINER (chooser_widget), scrolled_window);
 
-       gtk_list_box_set_filter_func (selector->priv->list_box,
+       gtk_list_box_set_filter_func (chooser_widget->priv->list_box,
                                      filter_cb,
-                                     selector,
+                                     chooser_widget,
                                      NULL);
 
-       g_signal_connect (selector->priv->search_entry,
+       g_signal_connect (chooser_widget->priv->search_entry,
                          "search-changed",
                          G_CALLBACK (search_changed_cb),
-                         selector);
+                         chooser_widget);
 
-       g_signal_connect (selector->priv->list_box,
+       g_signal_connect (chooser_widget->priv->list_box,
                          "row-activated",
                          G_CALLBACK (list_box_row_activated_cb),
-                         selector);
+                         chooser_widget);
 }
 
 /**
- * tepl_highlight_mode_selector_new:
+ * tepl_language_chooser_widget_new:
  *
- * Returns: (transfer floating): a new #TeplHighlightModeSelector widget.
+ * Returns: (transfer floating): a new #TeplLanguageChooserWidget.
  * Since: 5.2
  */
-TeplHighlightModeSelector *
-tepl_highlight_mode_selector_new (void)
+TeplLanguageChooserWidget *
+tepl_language_chooser_widget_new (void)
 {
-       return g_object_new (TEPL_TYPE_HIGHLIGHT_MODE_SELECTOR, NULL);
+       return g_object_new (TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET, NULL);
 }
diff --git a/tepl/tepl-language-chooser-widget.h b/tepl/tepl-language-chooser-widget.h
new file mode 100644
index 0000000..fa79dc2
--- /dev/null
+++ b/tepl/tepl-language-chooser-widget.h
@@ -0,0 +1,55 @@
+/* SPDX-FileCopyrightText: 2020 - Sébastien Wilmet <swilmet gnome org>
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#ifndef TEPL_LANGUAGE_CHOOSER_WIDGET_H
+#define TEPL_LANGUAGE_CHOOSER_WIDGET_H
+
+#if !defined (TEPL_H_INSIDE) && !defined (TEPL_COMPILATION)
+#error "Only <tepl/tepl.h> can be included directly."
+#endif
+
+#include <gtksourceview/gtksource.h>
+#include <tepl/tepl-macros.h>
+
+G_BEGIN_DECLS
+
+#define TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET             (tepl_language_chooser_widget_get_type ())
+#define TEPL_LANGUAGE_CHOOSER_WIDGET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET, TeplLanguageChooserWidget))
+#define TEPL_LANGUAGE_CHOOSER_WIDGET_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), 
TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET, TeplLanguageChooserWidgetClass))
+#define TEPL_IS_LANGUAGE_CHOOSER_WIDGET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET))
+#define TEPL_IS_LANGUAGE_CHOOSER_WIDGET_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), 
TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET))
+#define TEPL_LANGUAGE_CHOOSER_WIDGET_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), 
TEPL_TYPE_LANGUAGE_CHOOSER_WIDGET, TeplLanguageChooserWidgetClass))
+
+typedef struct _TeplLanguageChooserWidget         TeplLanguageChooserWidget;
+typedef struct _TeplLanguageChooserWidgetClass    TeplLanguageChooserWidgetClass;
+typedef struct _TeplLanguageChooserWidgetPrivate  TeplLanguageChooserWidgetPrivate;
+
+struct _TeplLanguageChooserWidget
+{
+       GtkGrid parent;
+
+       TeplLanguageChooserWidgetPrivate *priv;
+};
+
+struct _TeplLanguageChooserWidgetClass
+{
+       GtkGridClass parent_class;
+
+       /* Signals */
+       void (* language_selected)      (TeplLanguageChooserWidget *chooser_widget,
+                                        GtkSourceLanguage         *language);
+
+       gpointer padding[12];
+};
+
+_TEPL_EXTERN
+GType          tepl_language_chooser_widget_get_type   (void);
+
+_TEPL_EXTERN
+TeplLanguageChooserWidget *
+               tepl_language_chooser_widget_new        (void);
+
+G_END_DECLS
+
+#endif /* TEPL_LANGUAGE_CHOOSER_WIDGET_H */
diff --git a/tepl/tepl.h b/tepl/tepl.h
index b17e547..bb61d2b 100644
--- a/tepl/tepl.h
+++ b/tepl/tepl.h
@@ -23,12 +23,12 @@
 #include <tepl/tepl-fold-region.h>
 #include <tepl/tepl-goto-line-bar.h>
 #include <tepl/tepl-gutter-renderer-folds.h>
-#include <tepl/tepl-highlight-mode-selector.h>
 #include <tepl/tepl-info-bar.h>
 #include <tepl/tepl-init.h>
 #include <tepl/tepl-io-error-info-bars.h>
 #include <tepl/tepl-iter.h>
 #include <tepl/tepl-language-chooser.h>
+#include <tepl/tepl-language-chooser-widget.h>
 #include <tepl/tepl-menu-shell.h>
 #include <tepl/tepl-metadata.h>
 #include <tepl/tepl-metadata-manager.h>
diff --git a/tests/meson.build b/tests/meson.build
index 5aca626..0220564 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,7 @@
 interactive_tests = [
   # executable name, sources
   ['test-fold-region', 'test-fold-region.c'],
-  ['test-highlight-mode-selector', 'test-highlight-mode-selector.c'],
+  ['test-language-chooser-widget', 'test-language-chooser-widget.c'],
   ['test-space-drawer-prefs', 'test-space-drawer-prefs.c'],
   ['test-tab', 'test-tab.c'],
 
diff --git a/tests/test-highlight-mode-selector.c b/tests/test-language-chooser-widget.c
similarity index 73%
rename from tests/test-highlight-mode-selector.c
rename to tests/test-language-chooser-widget.c
index 2d57691..5b5a7eb 100644
--- a/tests/test-highlight-mode-selector.c
+++ b/tests/test-language-chooser-widget.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 static void
-language_selected_cb (TeplHighlightModeSelector *selector,
+language_selected_cb (TeplLanguageChooserWidget *chooser_widget,
                      GtkSourceLanguage         *language,
                      gpointer                   user_data)
 {
@@ -18,7 +18,7 @@ main (int    argc,
       char **argv)
 {
        GtkWidget *window;
-       TeplHighlightModeSelector *selector;
+       TeplLanguageChooserWidget *chooser_widget;
 
        gtk_init (&argc, &argv);
 
@@ -26,10 +26,10 @@ main (int    argc,
        gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);
        g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
-       selector = tepl_highlight_mode_selector_new ();
-       gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (selector));
+       chooser_widget = tepl_language_chooser_widget_new ();
+       gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (chooser_widget));
 
-       g_signal_connect (selector,
+       g_signal_connect (chooser_widget,
                          "language-selected",
                          G_CALLBACK (language_selected_cb),
                          NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]