...
 
Commits (11)
===============
Version 3.31.92
===============
Changes in this release:
• Cross-compilation fixes
• Subproject build fixes
• Allow disabling search entry in preferences
===============
Version 3.31.90
===============
......
libdazzle (3.31.92-1) experimental; urgency=medium
* New upstream release
* debian/libdazzle-1.0-0.symbols: Add new symbols
-- Jeremy Bicha <jbicha@debian.org> Wed, 06 Mar 2019 02:50:12 -0500
libdazzle (3.31.90-1) experimental; urgency=medium
* New upstream development release
......
......@@ -430,10 +430,12 @@ libdazzle-1.0.so.0 libdazzle-1.0-0 #MINVER#
dzl_preferences_spin_button_get_spin_button@Base 3.25.3
dzl_preferences_spin_button_get_type@Base 3.25.3
dzl_preferences_switch_get_type@Base 3.25.3
dzl_preferences_view_get_show_search_entry@Base 3.31.92
dzl_preferences_view_get_type@Base 3.25.3
dzl_preferences_view_get_use_sidebar@Base 3.29.91
dzl_preferences_view_new@Base 3.27.90
dzl_preferences_view_reapply_filter@Base 3.25.3
dzl_preferences_view_set_show_search_entry@Base 3.31.92
dzl_preferences_view_set_use_sidebar@Base 3.29.91
dzl_priority_box_get_type@Base 3.25.3
dzl_priority_box_new@Base 3.29.91
......
#include "config.h"
#include <glib/gi18n.h>
#include "example-window.h"
......@@ -171,7 +169,7 @@ example_window_init (ExampleWindow *self)
G_CALLBACK (on_page_changed),
self);
dzl_shortcut_manager_add_shortcut_entries (NULL, shortcuts, G_N_ELEMENTS (shortcuts), GETTEXT_PACKAGE);
dzl_shortcut_manager_add_shortcut_entries (NULL, shortcuts, G_N_ELEMENTS (shortcuts), NULL);
controller = dzl_shortcut_controller_find (GTK_WIDGET (self));
......
project('libdazzle', 'c',
version: '3.31.90',
version: '3.31.92',
license: 'GPLv3+',
meson_version: '>= 0.47.2',
default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
......@@ -33,7 +33,6 @@ config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('lo
add_project_arguments([
'-DHAVE_CONFIG_H',
'-DDAZZLE_COMPILATION',
'-I' + meson.build_root(),
], language: 'c')
root_inc = include_directories('.')
......
......@@ -132,7 +132,7 @@ if get_option('with_introspection')
install_dir_gir: girdir,
install_dir_typelib: typelibdir,
export_packages: libdazzle_package,
extra_args: [ '--c-include=dazzle.h', '--quiet' ],
extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION', ],
)
if get_option('with_vapi')
......
......@@ -48,6 +48,7 @@ typedef struct
guint last_widget_id;
guint use_sidebar : 1;
guint show_search_entry : 1;
} DzlPreferencesViewPrivate;
typedef struct
......@@ -66,6 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (DzlPreferencesView, dzl_preferences_view, GTK_TYPE_BIN,
enum {
PROP_0,
PROP_USE_SIDEBAR,
PROP_SHOW_SEARCH_ENTRY,
N_PROPS
};
......@@ -242,6 +244,10 @@ dzl_preferences_view_get_property (GObject *object,
g_value_set_boolean (value, dzl_preferences_view_get_use_sidebar (self));
break;
case PROP_SHOW_SEARCH_ENTRY:
g_value_set_boolean (value, dzl_preferences_view_get_show_search_entry (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
......@@ -261,6 +267,10 @@ dzl_preferences_view_set_property (GObject *object,
dzl_preferences_view_set_use_sidebar (self, g_value_get_boolean (value));
break;
case PROP_SHOW_SEARCH_ENTRY:
dzl_preferences_view_set_show_search_entry (self, g_value_get_boolean (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
......@@ -293,6 +303,13 @@ dzl_preferences_view_class_init (DzlPreferencesViewClass *klass)
FALSE,
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
properties [PROP_SHOW_SEARCH_ENTRY] =
g_param_spec_boolean ("show-search-entry",
"Show SearchEntry",
"Show SearchEntry in the sidebar",
FALSE,
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties);
}
......@@ -363,6 +380,7 @@ dzl_preferences_view_init (DzlPreferencesView *self)
};
priv->use_sidebar = TRUE;
priv->show_search_entry = TRUE;
gtk_widget_init_template (GTK_WIDGET (self));
......@@ -1131,3 +1149,34 @@ dzl_preferences_view_set_use_sidebar (DzlPreferencesView *self,
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_USE_SIDEBAR]);
}
}
gboolean
dzl_preferences_view_get_show_search_entry (DzlPreferencesView *self)
{
DzlPreferencesViewPrivate *priv = dzl_preferences_view_get_instance_private (self);
g_return_val_if_fail (DZL_IS_PREFERENCES_VIEW (self), FALSE);
return priv->show_search_entry;
}
void
dzl_preferences_view_set_show_search_entry (DzlPreferencesView *self,
gboolean show_search_entry)
{
DzlPreferencesViewPrivate *priv = dzl_preferences_view_get_instance_private (self);
g_return_if_fail (DZL_IS_PREFERENCES_VIEW (self));
if (!dzl_preferences_view_get_use_sidebar (self))
return;
if (priv->show_search_entry != show_search_entry)
{
priv->show_search_entry = show_search_entry;
gtk_widget_set_visible (GTK_WIDGET (priv->search_entry), show_search_entry);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_SHOW_SEARCH_ENTRY]);
}
}
......@@ -41,14 +41,19 @@ struct _DzlPreferencesViewClass
};
DZL_AVAILABLE_IN_3_28
GtkWidget *dzl_preferences_view_new (void);
GtkWidget *dzl_preferences_view_new (void);
DZL_AVAILABLE_IN_ALL
void dzl_preferences_view_reapply_filter (DzlPreferencesView *self);
void dzl_preferences_view_reapply_filter (DzlPreferencesView *self);
DZL_AVAILABLE_IN_3_30
gboolean dzl_preferences_view_get_use_sidebar (DzlPreferencesView *self);
gboolean dzl_preferences_view_get_use_sidebar (DzlPreferencesView *self);
DZL_AVAILABLE_IN_3_30
void dzl_preferences_view_set_use_sidebar (DzlPreferencesView *self,
gboolean use_sidebar);
void dzl_preferences_view_set_use_sidebar (DzlPreferencesView *self,
gboolean use_sidebar);
DZL_AVAILABLE_IN_3_30
gboolean dzl_preferences_view_get_show_search_entry (DzlPreferencesView *self);
DZL_AVAILABLE_IN_3_30
void dzl_preferences_view_set_show_search_entry (DzlPreferencesView *self,
gboolean show_search_entry);
G_END_DECLS
......
......@@ -330,9 +330,10 @@ test_list_store_adapter = executable('test-list-store-adapter', 'test-list-store
test('test-list-store-adapter', test_list_store_adapter, env: test_env)
test_util = executable('test-util', ['test-util.c', '../src/util/dzl-util.c'],
c_args: test_cflags,
link_args: test_link_args,
dependencies: libdazzle_deps + [libdazzle_dep],
c_args: test_cflags,
link_args: test_link_args,
include_directories: [include_directories('.'), root_inc ],
dependencies: libdazzle_deps + [libdazzle_dep],
)
test('test-util', test_util, env: test_env)
......