[Xfce4-commits] [apps/parole] 01/01: Bump minimum GTK version to 3.14 to clean up ifdefs and glade deprecations
noreply at xfce.org
noreply at xfce.org
Sun Feb 26 03:21:57 CET 2017
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository apps/parole.
commit c14a3a606cb21783e5cc0b9fb8eaf85b4465e758
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Feb 25 21:21:50 2017 -0500
Bump minimum GTK version to 3.14 to clean up ifdefs and glade deprecations
---
configure.ac.in | 2 +-
data/interfaces/mediachooser.ui | 8 ++--
data/interfaces/open-location.ui | 9 +++--
data/interfaces/parole-settings.ui | 75 ++++++++---------------------------
data/interfaces/parole.ui | 15 +++----
data/interfaces/playlist.ui | 4 +-
data/interfaces/plugins.ui | 10 ++---
data/interfaces/save-playlist.ui | 4 +-
src/common/parole-common.c | 1 -
src/gst/parole-gst.c | 16 --------
src/parole-player.c | 80 ++++++--------------------------------
src/plugins/tray/tray-provider.c | 4 --
12 files changed, 53 insertions(+), 175 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 7fd4de6..e8c1ac9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -88,7 +88,7 @@ XDT_I18N([@LINGUAS@])
# ===================================================== #
# Check for required packages #
# ===================================================== #
-m4_define([gtk_minimum_version], [3.2.0])
+m4_define([gtk_minimum_version], [3.14.0])
m4_define([glib_minimum_version], [2.32.0])
m4_define([clutter_minimum_version], [1.16.4])
m4_define([cluttergtk_minimum_version], [1.4.4])
diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui
index 447414c..29f8baf 100644
--- a/data/interfaces/mediachooser.ui
+++ b/data/interfaces/mediachooser.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkDialog" id="chooser">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">0</property>
<property name="title" translatable="yes">Open Media Files</property>
<property name="modal">True</property>
<property name="default_width">640</property>
@@ -79,7 +79,7 @@
<object class="GtkFileChooserWidget" id="filechooserwidget">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">0</property>
<signal name="current-folder-changed" handler="media_chooser_folder_changed_cb" swapped="no"/>
<signal name="file-activated" handler="media_chooser_file_activate_cb" swapped="no"/>
</object>
diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index 9baaec8..2f83e1d 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11,6 +11,7 @@
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Open Network Location</property>
+ <property name="resizable">False</property>
<property name="default_width">450</property>
<property name="icon_name">parole</property>
<property name="type_hint">dialog</property>
@@ -87,7 +88,7 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="yalign">0</property>
+ <property name="valign">center</property>
<property name="pixel_size">48</property>
<property name="icon_name">network-workgroup</property>
</object>
@@ -107,7 +108,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"><big><b>Open Network Location</b></big></property>
<property name="use_markup">True</property>
</object>
diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui
index f9c589d..168e929 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
- <requires lib="libxfce4ui" version="4.11"/>
+ <requires lib="gtk+" version="3.14"/>
+ <requires lib="libxfce4ui-2" version="4.11"/>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -114,7 +114,7 @@
<object class="GtkLabel" id="reset-saver-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Disable screensaver when playing movies</property>
</object>
<packing>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="enable-vis-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Show visual effects when an audio file is played</property>
</object>
<packing>
@@ -293,7 +293,7 @@
<object class="GtkLabel" id="multimedia-keys-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Enable keyboard multimedia keys</property>
</object>
<packing>
@@ -440,7 +440,6 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Please restart Parole for this change to take effect.</property>
</object>
<packing>
@@ -515,56 +514,48 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Brightness:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Contrast:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Hue:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Saturation:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -578,8 +569,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -592,8 +581,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -606,8 +593,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -620,8 +605,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -719,57 +702,49 @@
<object class="GtkLabel" id="replace-playlist-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Always replace playlist with opened files</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="remove-duplicated-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Check and remove duplicate media entries</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="start-playing-opened-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Start playing opened files</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="remember-playlist-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Remember playlist</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -780,8 +755,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -792,8 +765,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -804,8 +775,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -816,8 +785,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -880,7 +847,7 @@
<object class="GtkLabel" id="enable-subtitle-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Automatically show subtitles when playing movie file</property>
</object>
<packing>
@@ -918,28 +885,24 @@
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Font:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Encoding:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -956,8 +919,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -969,8 +930,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 8ccf808..fe36134 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -658,7 +658,7 @@
<property name="height_request">256</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="pixel_size">256</property>
<property name="icon_name">audio-x-generic-symbolic</property>
<property name="use_fallback">True</property>
@@ -679,11 +679,11 @@
<object class="GtkLabel" id="audio_title">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">end</property>
<property name="label" translatable="yes"><span color='#F4F4F4'><b><big>Unknown Song</big></b></span></property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
</object>
<packing>
<property name="expand">True</property>
@@ -695,10 +695,11 @@
<object class="GtkLabel" id="audio_album">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"><big><span color='#BBBBBB'><i>on</i></span> <span color='#F4F4F4'>Unknown Album</span></big></property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -710,11 +711,11 @@
<object class="GtkLabel" id="audio_artist">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
<property name="label" translatable="yes"><big><span color='#BBBBBB'><i>by</i></span> <span color='#F4F4F4'>Unknown Artist</span></big></property>
<property name="use_markup">True</property>
<property name="ellipsize">end</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index affd611..318c7ae 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkBox" id="playlist-box">
<property name="width_request">220</property>
<property name="visible">True</property>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 20bcedf..a20ffa7 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
- <requires lib="libxfce4ui" version="4.11"/>
+ <requires lib="gtk+" version="3.14"/>
+ <requires lib="libxfce4ui-2" version="4.11"/>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name toggle -->
@@ -137,8 +137,6 @@
<object class="GtkLabel" id="description">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="wrap">True</property>
</object>
</child>
@@ -174,8 +172,6 @@
<object class="GtkLabel" id="author">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="wrap">True</property>
</object>
</child>
diff --git a/data/interfaces/save-playlist.ui b/data/interfaces/save-playlist.ui
index 88091d1..6002166 100644
--- a/data/interfaces/save-playlist.ui
+++ b/data/interfaces/save-playlist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name filetype -->
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index d9c8a0c..0faeee2 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -74,7 +74,6 @@ parole_dialog_show (GtkWindow *parent,
gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", msg);
-
g_signal_connect_swapped (dialog,
"response",
G_CALLBACK (gtk_widget_destroy),
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index aca65e5..5b988a6 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -461,10 +461,6 @@ static void
parole_gst_set_video_overlay (ParoleGst *gst)
{
GstElement *video_sink;
-#if GTK_CHECK_VERSION(3,8,0)
-#else
- gchar *videosink;
-#endif
g_object_get (G_OBJECT (gst->priv->playbin),
"video-sink", &video_sink,
@@ -481,18 +477,6 @@ parole_gst_set_video_overlay (ParoleGst *gst)
GDK_WINDOW_XID ( gtk_widget_get_window(GTK_WIDGET (gst)) ));
#endif
-#if GTK_CHECK_VERSION(3,8,0)
-#else
- g_object_get (G_OBJECT (gst->priv->conf),
- "videosink", &videosink,
- NULL);
- if (g_strcmp0(videosink, "ximagesink") == 0)
- {
- g_object_set(video_sink, "autopaint-colorkey", FALSE,
- "colorkey", 0x080810, NULL);
- }
-#endif
-
gst_object_unref (video_sink);
}
diff --git a/src/parole-player.c b/src/parole-player.c
index 96f8b85..03d0a3e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -397,9 +397,7 @@ struct ParolePlayerPrivate
GtkWidget *showhide_playlist_menu_item;
GtkWidget *repeat_menu_item;
GtkWidget *shuffle_menu_item;
-#if GTK_CHECK_VERSION(3,10,0)
GtkWidget *revealer;
-#endif
/* Infobar */
GtkWidget *infobar;
@@ -2155,7 +2153,7 @@ parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
gtk_widget_show (player->priv->fullscreen_button);
gtk_widget_hide(player->priv->label_divider);
gtk_widget_show(player->priv->range);
- gtk_widget_set_halign (player->priv->audiobox_cover, GTK_ALIGN_FILL);
+ gtk_widget_set_halign (player->priv->audiobox_cover, GTK_ALIGN_END);
if ( !player->priv->full_screen )
{
@@ -2366,21 +2364,12 @@ parole_player_gst_widget_button_release (GtkWidget *widget, GdkEventButton *ev,
gboolean parole_player_hide_controls (gpointer data)
{
ParolePlayer *player;
-#if GTK_CHECK_VERSION(3,10,0)
-#else
- GtkWidget *controls;
-#endif
TRACE("start");
player = PAROLE_PLAYER (data);
-#if GTK_CHECK_VERSION(3,10,0)
gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), FALSE);
-#else
- controls = gtk_widget_get_parent(player->priv->control);
- gtk_widget_hide(controls);
-#endif
parole_player_set_cursor_visible (player, FALSE);
@@ -2403,7 +2392,6 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
parole_player_set_cursor_visible (player, TRUE);
-#if GTK_CHECK_VERSION(3,10,0)
if (gtk_revealer_get_reveal_child(GTK_REVEALER(player->priv->revealer)))
{
if ((gdouble)gtk_widget_get_allocated_height(widget) - ev->y >= 32.0)
@@ -2430,24 +2418,6 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
{
gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), TRUE);
}
-#else
- if ( player->priv->state == PAROLE_STATE_PLAYING )
- {
- g_object_get (G_OBJECT (player->priv->conf),
- "hide-controls-timeout", &hide_controls_timeout,
- NULL);
-
- if (hide_controls_timeout != 0 || player->priv->full_screen)
- {
- if (player->priv->full_screen)
- hide_timeout = g_timeout_add_seconds (4,
- (GSourceFunc) parole_player_hide_controls, player);
- else
- hide_timeout = g_timeout_add_seconds (hide_controls_timeout,
- (GSourceFunc) parole_player_hide_controls, player);
- }
- }
-#endif
return FALSE;
}
@@ -3309,10 +3279,6 @@ parole_player_init (ParolePlayer *player)
/* Content Area */
GtkWidget *controls_overlay;
-#if GTK_CHECK_VERSION(3,10,0)
-#else
- GtkWidget *tmp_box;
-#endif
GtkWidget *controls_parent;
GtkWidget *play_box;
#if GTK_CHECK_VERSION(3,16,0)
@@ -3694,42 +3660,18 @@ parole_player_init (ParolePlayer *player)
parole_widget_reparent(GTK_WIDGET(player->priv->eventbox_output), controls_overlay);
- #if GTK_CHECK_VERSION(3,8,0)
- #else
- gdk_rgba_parse (&background, "#080810");
- gtk_widget_override_background_color(GTK_WIDGET(controls_overlay), GTK_STATE_FLAG_NORMAL, &background);
- #endif
+ player->priv->revealer = gtk_revealer_new ();
+ gtk_widget_set_vexpand(GTK_WIDGET(player->priv->revealer), FALSE);
+ gtk_widget_set_hexpand(GTK_WIDGET(player->priv->revealer), FALSE);
+ gtk_revealer_set_transition_duration (GTK_REVEALER(player->priv->revealer), 250);
+ gtk_revealer_set_transition_type (GTK_REVEALER(player->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP);
+ gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), TRUE);
+ gtk_widget_set_valign(player->priv->revealer, GTK_ALIGN_END);
- #if GTK_CHECK_VERSION(3,10,0)
- /* Use GtkRevealer for GTK 3.10 and newer */
- player->priv->revealer = gtk_revealer_new ();
- gtk_widget_set_vexpand(GTK_WIDGET(player->priv->revealer), FALSE);
- gtk_widget_set_hexpand(GTK_WIDGET(player->priv->revealer), FALSE);
- gtk_revealer_set_transition_duration (GTK_REVEALER(player->priv->revealer), 250);
- gtk_revealer_set_transition_type (GTK_REVEALER(player->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP);
- gtk_revealer_set_reveal_child(GTK_REVEALER(player->priv->revealer), TRUE);
- gtk_widget_set_valign(player->priv->revealer, GTK_ALIGN_END);
+ parole_widget_reparent(GTK_WIDGET(player->priv->control), player->priv->revealer);
- parole_widget_reparent(GTK_WIDGET(player->priv->control), player->priv->revealer);
-
- gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), player->priv->revealer);
- gtk_widget_show_all(player->priv->revealer);
- #else
- /* Use floating overlay for GTK 3.8 and older */
- tmp_box = GTK_WIDGET(gtk_event_box_new());
-
- gtk_widget_set_vexpand(GTK_WIDGET(tmp_box), FALSE);
- gtk_widget_set_hexpand(GTK_WIDGET(tmp_box), FALSE);
- gtk_widget_set_margin_left(tmp_box, 10);
- gtk_widget_set_margin_right(tmp_box, 10);
- gtk_widget_set_margin_bottom(tmp_box, 10);
- gtk_widget_set_margin_top(tmp_box, 10);
- gtk_widget_set_valign(tmp_box, GTK_ALIGN_END);
-
- gtk_widget_reparent(GTK_WIDGET(player->priv->control), tmp_box);
-
- gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), tmp_box);
- #endif
+ gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), player->priv->revealer);
+ gtk_widget_show_all(player->priv->revealer);
gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(play_box), TRUE, TRUE, 2, GTK_PACK_START );
gtk_container_set_border_width(GTK_CONTAINER(play_box), 3);
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 752d988..0e86387 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -360,11 +360,7 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(check), 3);
-#else
- gtk_widget_set_margin_left (GTK_WIDGET(check), 3);
-#endif
gtk_widget_show_all( GTK_WIDGET(dialog) );
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list