[Xfce4-commits] [apps/xfdashboard] 03/03: Rename XfdashboardFitMode to XfdashboardViewFitMode
noreply at xfce.org
noreply at xfce.org
Thu Aug 13 20:34:19 CEST 2015
This is an automated email from the git hooks/post-receive script.
nomad pushed a commit to branch master
in repository apps/xfdashboard.
commit 5b4f6aa87057d0921935ea71c715752138c285e1
Author: Stephan Haller <nomad at froevel.de>
Date: Thu Aug 13 20:34:01 2015 +0200
Rename XfdashboardFitMode to XfdashboardViewFitMode
---
xfdashboard/applications-view.c | 2 +-
xfdashboard/search-view.c | 2 +-
xfdashboard/view.c | 28 ++++++++++++++--------------
xfdashboard/view.h | 28 ++++++++++++++--------------
xfdashboard/viewpad.c | 16 ++++++++--------
xfdashboard/windows-view.c | 2 +-
6 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/xfdashboard/applications-view.c b/xfdashboard/applications-view.c
index 016f23a..83f73c1 100644
--- a/xfdashboard/applications-view.c
+++ b/xfdashboard/applications-view.c
@@ -1379,7 +1379,7 @@ static void xfdashboard_applications_view_init(XfdashboardApplicationsView *self
/* Set up actor */
xfdashboard_actor_set_can_focus(XFDASHBOARD_ACTOR(self), TRUE);
- xfdashboard_view_set_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_FIT_MODE_HORIZONTAL);
+ xfdashboard_view_set_view_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL);
xfdashboard_applications_view_set_view_mode(self, XFDASHBOARD_VIEW_MODE_LIST);
clutter_model_set_sorting_column(CLUTTER_MODEL(priv->apps), XFDASHBOARD_APPLICATIONS_MENU_MODEL_COLUMN_TITLE);
diff --git a/xfdashboard/search-view.c b/xfdashboard/search-view.c
index 6572b08..617925c 100644
--- a/xfdashboard/search-view.c
+++ b/xfdashboard/search-view.c
@@ -1736,7 +1736,7 @@ static void xfdashboard_search_view_init(XfdashboardSearchView *self)
clutter_box_layout_set_orientation(CLUTTER_BOX_LAYOUT(layout), CLUTTER_ORIENTATION_VERTICAL);
clutter_actor_set_layout_manager(CLUTTER_ACTOR(self), layout);
- xfdashboard_view_set_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_FIT_MODE_HORIZONTAL);
+ xfdashboard_view_set_view_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL);
/* Create instance of each registered view type and add it to this actor
* and connect signals
diff --git a/xfdashboard/view.c b/xfdashboard/view.c
index b98122f..d1a3fbd 100644
--- a/xfdashboard/view.c
+++ b/xfdashboard/view.c
@@ -56,7 +56,7 @@ struct _XfdashboardViewPrivate
gchar *viewIcon;
ClutterContent *viewIconImage;
- XfdashboardFitMode fitMode;
+ XfdashboardViewFitMode fitMode;
gboolean isEnabled;
@@ -73,7 +73,7 @@ enum
PROP_VIEW_NAME,
PROP_VIEW_ICON,
- PROP_FIT_MODE,
+ PROP_VIEW_FIT_MODE,
PROP_ENABLED,
@@ -271,8 +271,8 @@ static void _xfdashboard_view_set_property(GObject *inObject,
xfdashboard_view_set_icon(self, g_value_get_string(inValue));
break;
- case PROP_FIT_MODE:
- xfdashboard_view_set_fit_mode(self, (XfdashboardFitMode)g_value_get_enum(inValue));
+ case PROP_VIEW_FIT_MODE:
+ xfdashboard_view_set_view_fit_mode(self, (XfdashboardViewFitMode)g_value_get_enum(inValue));
break;
case PROP_ENABLED:
@@ -306,7 +306,7 @@ static void _xfdashboard_view_get_property(GObject *inObject,
g_value_set_string(outValue, self->priv->viewIcon);
break;
- case PROP_FIT_MODE:
+ case PROP_VIEW_FIT_MODE:
g_value_set_enum(outValue, self->priv->fitMode);
break;
@@ -363,12 +363,12 @@ static void xfdashboard_view_class_init(XfdashboardViewClass *klass)
NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
- XfdashboardViewProperties[PROP_FIT_MODE]=
+ XfdashboardViewProperties[PROP_VIEW_FIT_MODE]=
g_param_spec_enum("fit-mode",
_("Fit mode"),
_("Defines if view should be fit into viewpad and its orientation"),
- XFDASHBOARD_TYPE_FIT_MODE,
- XFDASHBOARD_FIT_MODE_NONE,
+ XFDASHBOARD_TYPE_VIEW_FIT_MODE,
+ XFDASHBOARD_VIEW_FIT_MODE_NONE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
XfdashboardViewProperties[PROP_ENABLED]=
@@ -562,7 +562,7 @@ static void xfdashboard_view_init(XfdashboardView *self)
priv->viewName=NULL;
priv->viewIcon=NULL;
priv->viewIconImage=NULL;
- priv->fitMode=XFDASHBOARD_FIT_MODE_NONE;
+ priv->fitMode=XFDASHBOARD_VIEW_FIT_MODE_NONE;
priv->isEnabled=TRUE;
/* Set up actor */
@@ -664,14 +664,14 @@ void xfdashboard_view_set_icon(XfdashboardView *self, const gchar *inIcon)
}
/* Get/set fit mode of view */
-XfdashboardFitMode xfdashboard_view_get_fit_mode(XfdashboardView *self)
+XfdashboardViewFitMode xfdashboard_view_get_view_fit_mode(XfdashboardView *self)
{
- g_return_val_if_fail(XFDASHBOARD_IS_VIEW(self), XFDASHBOARD_FIT_MODE_NONE);
+ g_return_val_if_fail(XFDASHBOARD_IS_VIEW(self), XFDASHBOARD_VIEW_FIT_MODE_NONE);
return(self->priv->fitMode);
}
-void xfdashboard_view_set_fit_mode(XfdashboardView *self, XfdashboardFitMode inFitMode)
+void xfdashboard_view_set_view_fit_mode(XfdashboardView *self, XfdashboardViewFitMode inFitMode)
{
XfdashboardViewPrivate *priv;
XfdashboardViewClass *klass;
@@ -688,10 +688,10 @@ void xfdashboard_view_set_fit_mode(XfdashboardView *self, XfdashboardFitMode inF
priv->fitMode=inFitMode;
/* Call virtual function for setting fit mode */
- if(klass->set_fit_mode) klass->set_fit_mode(self, inFitMode);
+ if(klass->set_view_fit_mode) klass->set_view_fit_mode(self, inFitMode);
/* Notify about property change */
- g_object_notify_by_pspec(G_OBJECT(self), XfdashboardViewProperties[PROP_FIT_MODE]);
+ g_object_notify_by_pspec(G_OBJECT(self), XfdashboardViewProperties[PROP_VIEW_FIT_MODE]);
}
}
diff --git a/xfdashboard/view.h b/xfdashboard/view.h
index 9456db4..3be7dad 100644
--- a/xfdashboard/view.h
+++ b/xfdashboard/view.h
@@ -34,22 +34,22 @@ G_BEGIN_DECLS
/* Public definitions */
/**
- * XfdashboardFitMode:
+ * XfdashboardViewFitMode:
*
- * @XFDASHBOARD_FIT_MODE_NONE: Do not try to fit view into viewpad.
- * @XFDASHBOARD_FIT_MODE_HORIZONTAL: Try to fit view into viewpad horizontally.
- * @XFDASHBOARD_FIT_MODE_VERTICAL: Try to fit view into viewpad vertically.
- * @XFDASHBOARD_FIT_MODE_BOTH: Try to fit view into viewpad horizontally and vertically.
+ * @XFDASHBOARD_VIEW_FIT_MODE_NONE: Do not try to fit view into viewpad.
+ * @XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL: Try to fit view into viewpad horizontally.
+ * @XFDASHBOARD_VIEW_FIT_MODE_VERTICAL: Try to fit view into viewpad vertically.
+ * @XFDASHBOARD_VIEW_FIT_MODE_BOTH: Try to fit view into viewpad horizontally and vertically.
*
* Determines how a view should fit into a viewpad.
*/
-typedef enum /*< prefix=XFDASHBOARD_FIT_MODE >*/
+typedef enum /*< prefix=XFDASHBOARD_VIEW_FIT_MODE >*/
{
- XFDASHBOARD_FIT_MODE_NONE=0,
- XFDASHBOARD_FIT_MODE_HORIZONTAL,
- XFDASHBOARD_FIT_MODE_VERTICAL,
- XFDASHBOARD_FIT_MODE_BOTH
-} XfdashboardFitMode;
+ XFDASHBOARD_VIEW_FIT_MODE_NONE=0,
+ XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL,
+ XFDASHBOARD_VIEW_FIT_MODE_VERTICAL,
+ XFDASHBOARD_VIEW_FIT_MODE_BOTH
+} XfdashboardViewFitMode;
/* Object declaration */
@@ -81,7 +81,7 @@ struct _XfdashboardViewClass
/*< public >*/
/* Virtual functions */
- void (*set_fit_mode)(XfdashboardView *self, XfdashboardFitMode inFitMode);
+ void (*set_view_fit_mode)(XfdashboardView *self, XfdashboardViewFitMode inFitMode);
void (*activating)(XfdashboardView *self);
void (*activated)(XfdashboardView *self);
@@ -119,8 +119,8 @@ void xfdashboard_view_set_name(XfdashboardView *self, const gchar *inName);
const gchar* xfdashboard_view_get_icon(XfdashboardView *self);
void xfdashboard_view_set_icon(XfdashboardView *self, const gchar *inIcon);
-XfdashboardFitMode xfdashboard_view_get_fit_mode(XfdashboardView *self);
-void xfdashboard_view_set_fit_mode(XfdashboardView *self, XfdashboardFitMode inFitMode);
+XfdashboardViewFitMode xfdashboard_view_get_view_fit_mode(XfdashboardView *self);
+void xfdashboard_view_set_view_fit_mode(XfdashboardView *self, XfdashboardViewFitMode inFitMode);
gboolean xfdashboard_view_get_enabled(XfdashboardView *self);
void xfdashboard_view_set_enabled(XfdashboardView *self, gboolean inIsEnabled);
diff --git a/xfdashboard/viewpad.c b/xfdashboard/viewpad.c
index 23b20cd..8f9b7ec 100644
--- a/xfdashboard/viewpad.c
+++ b/xfdashboard/viewpad.c
@@ -869,8 +869,8 @@ static void _xfdashboard_viewpad_allocate(ClutterActor *self,
{
hScrollbarVisible=TRUE;
}
- if(xfdashboard_view_get_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_FIT_MODE_HORIZONTAL ||
- xfdashboard_view_get_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_FIT_MODE_BOTH)
+ if(xfdashboard_view_get_view_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL ||
+ xfdashboard_view_get_view_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_VIEW_FIT_MODE_BOTH)
{
hScrollbarVisible=FALSE;
}
@@ -882,8 +882,8 @@ static void _xfdashboard_viewpad_allocate(ClutterActor *self,
{
vScrollbarVisible=TRUE;
}
- if(xfdashboard_view_get_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_FIT_MODE_VERTICAL ||
- xfdashboard_view_get_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_FIT_MODE_BOTH)
+ if(xfdashboard_view_get_view_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_VIEW_FIT_MODE_VERTICAL ||
+ xfdashboard_view_get_view_fit_mode(XFDASHBOARD_VIEW(priv->activeView))==XFDASHBOARD_VIEW_FIT_MODE_BOTH)
{
vScrollbarVisible=FALSE;
}
@@ -928,19 +928,19 @@ static void _xfdashboard_viewpad_allocate(ClutterActor *self,
clutter_actor_get_clip(CLUTTER_ACTOR(priv->activeView), &x, &y, NULL, NULL);
}
- switch(xfdashboard_view_get_fit_mode(XFDASHBOARD_VIEW(priv->activeView)))
+ switch(xfdashboard_view_get_view_fit_mode(XFDASHBOARD_VIEW(priv->activeView)))
{
- case XFDASHBOARD_FIT_MODE_BOTH:
+ case XFDASHBOARD_VIEW_FIT_MODE_BOTH:
w=viewWidth;
h=viewHeight;
break;
- case XFDASHBOARD_FIT_MODE_HORIZONTAL:
+ case XFDASHBOARD_VIEW_FIT_MODE_HORIZONTAL:
w=viewWidth;
clutter_actor_get_preferred_height(CLUTTER_ACTOR(priv->activeView), w, NULL, &h);
break;
- case XFDASHBOARD_FIT_MODE_VERTICAL:
+ case XFDASHBOARD_VIEW_FIT_MODE_VERTICAL:
h=viewHeight;
clutter_actor_get_preferred_width(CLUTTER_ACTOR(priv->activeView), h, NULL, &w);
break;
diff --git a/xfdashboard/windows-view.c b/xfdashboard/windows-view.c
index ab5ffce..a2b089e 100644
--- a/xfdashboard/windows-view.c
+++ b/xfdashboard/windows-view.c
@@ -1940,7 +1940,7 @@ static void xfdashboard_windows_view_init(XfdashboardWindowsView *self)
xfdashboard_view_set_internal_name(XFDASHBOARD_VIEW(self), "windows");
xfdashboard_view_set_name(XFDASHBOARD_VIEW(self), _("Windows"));
xfdashboard_view_set_icon(XFDASHBOARD_VIEW(self), DEFAULT_VIEW_ICON);
- xfdashboard_view_set_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_FIT_MODE_BOTH);
+ xfdashboard_view_set_view_fit_mode(XFDASHBOARD_VIEW(self), XFDASHBOARD_VIEW_FIT_MODE_BOTH);
/* Setup actor */
xfdashboard_actor_set_can_focus(XFDASHBOARD_ACTOR(self), TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list