Author: kelnos
Date: 2006-08-02 06:45:45 +0000 (Wed, 02 Aug 2006)
New Revision: 22621
Modified:
xfmedia/branches/experimental/configure.ac
xfmedia/branches/experimental/src/mainwin-callbacks.c
xfmedia/branches/experimental/src/xfmedia-common.c
xfmedia/branches/experimental/src/xfmedia-common.h
xfmedia/branches/experimental/src/xfmedia-infobar.c
xfmedia/branches/experimental/src/xfmedia-tray-icon.c
xfmedia/trunk/configure.ac
xfmedia/trunk/src/mainwin-callbacks.c
xfmedia/trunk/src/mainwin.c
xfmedia/trunk/src/trayicon.c
xfmedia/trunk/src/xfmedia-common.c
xfmedia/trunk/src/xfmedia-common.h
Log:
* if gtk 2.6 is good enough for xfce, it's good enough for us
* use normal GtkLabel instead of ExoEllipsizedLabel
* replace XfceIconTheme stuff with libgui GtkIconTheme convenience functions
Modified: xfmedia/branches/experimental/configure.ac
===================================================================
--- xfmedia/branches/experimental/configure.ac 2006-08-02 06:17:47 UTC (rev
22620)
+++ xfmedia/branches/experimental/configure.ac 2006-08-02 06:45:45 UTC (rev
22621)
@@ -100,11 +100,11 @@
AC_SUBST(LIBX11_LIBS)
dnl required
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.4.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
XDT_CHECK_PACKAGE([LIBXINE], [libxine], [1.0.0])
Modified: xfmedia/branches/experimental/src/mainwin-callbacks.c
===================================================================
--- xfmedia/branches/experimental/src/mainwin-callbacks.c 2006-08-02
06:17:47 UTC (rev 22620)
+++ xfmedia/branches/experimental/src/mainwin-callbacks.c 2006-08-02
06:45:45 UTC (rev 22621)
@@ -320,9 +320,8 @@
gtk_widget_show(frame);
gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
- lbl = exo_ellipsized_label_new(filename);
- exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(lbl),
- EXO_PANGO_ELLIPSIZE_START);
+ lbl = gtk_label_new(filename);
+ gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_START);
gtk_label_set_selectable(GTK_LABEL(lbl), TRUE);
gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
gtk_label_set_text(GTK_LABEL(lbl), filename);
Modified: xfmedia/branches/experimental/src/xfmedia-common.c
===================================================================
--- xfmedia/branches/experimental/src/xfmedia-common.c 2006-08-02 06:17:47 UTC
(rev 22620)
+++ xfmedia/branches/experimental/src/xfmedia-common.c 2006-08-02 06:45:45 UTC
(rev 22621)
@@ -52,14 +52,9 @@
#include "xfmedia-icon.h"
#include "mainwin.h"
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#include "gtk26-stock-icons.h"
-#endif
#include "xfmedia-stock-icons.h"
-XfceIconTheme *icon_theme = NULL;
-
GtkWidget *
xfmedia_custom_button_new_from_pixdata(const gchar *text,
const GdkPixdata *pixdata)
@@ -115,7 +110,7 @@
img = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
if(!img || gtk_image_get_storage_type(GTK_IMAGE(img)) ==
GTK_IMAGE_EMPTY) {
gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &iw, &ih);
- pix = xfce_icon_theme_load(icon_theme, icon, iw);
+ pix = xfce_themed_icon_load(icon, iw);
if(pix) {
if(img)
gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
@@ -210,11 +205,16 @@
void
xfmedia_init_icon_theme()
{
- if(icon_theme)
+ static gboolean __inited = FALSE;
+ GtkIconTheme *icon_theme;
+
+ if(__inited)
return;
- icon_theme = xfce_icon_theme_get_for_screen(NULL);
- xfce_icon_theme_prepend_search_path(icon_theme, DATADIR "/icons/");
+ icon_theme = gtk_icon_theme_get_default();
+ gtk_icon_theme_prepend_search_path(icon_theme, DATADIR "/icons/");
+
+ __inited = TRUE;
}
gchar *
@@ -610,6 +610,7 @@
smaller_stock_icon_load_internal(const gchar *stock_id, GtkIconSize size,
gint ratio)
{
+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
GdkPixbuf *pix;
GtkWidget *img;
Modified: xfmedia/branches/experimental/src/xfmedia-common.h
===================================================================
--- xfmedia/branches/experimental/src/xfmedia-common.h 2006-08-02 06:17:47 UTC
(rev 22620)
+++ xfmedia/branches/experimental/src/xfmedia-common.h 2006-08-02 06:45:45 UTC
(rev 22621)
@@ -24,28 +24,15 @@
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/xfce-icontheme.h>
-
#define round(x) ( ((gdouble)x-(gint)x) >= 0.5000 ? ((gint)x)+1 : (gint)x )
#define BORDER 8
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#define GTK_STOCK_MEDIA_NEXT "gtk-media-next"
-#define GTK_STOCK_MEDIA_PAUSE "gtk-media-pause"
-#define GTK_STOCK_MEDIA_PLAY "gtk-media-play"
-#define GTK_STOCK_MEDIA_PREVIOUS "gtk-media-previous"
-#define GTK_STOCK_MEDIA_STOP "gtk-media-stop"
-#define GTK_STOCK_ABOUT "gtk-about"
-#define GTK_STOCK_DIRECTORY "gtk-directory"
-#endif
-
#define XFMEDIA_STOCK_VOLUME "xfmedia-volume"
#define AUTOHIDE_TIMEOUT 500
G_BEGIN_DECLS
-extern XfceIconTheme *icon_theme;
extern const GdkPixdata xfmedia_icon;
void xfmedia_init_icon_theme();
Modified: xfmedia/branches/experimental/src/xfmedia-infobar.c
===================================================================
--- xfmedia/branches/experimental/src/xfmedia-infobar.c 2006-08-02 06:17:47 UTC
(rev 22620)
+++ xfmedia/branches/experimental/src/xfmedia-infobar.c 2006-08-02 06:45:45 UTC
(rev 22621)
@@ -75,9 +75,8 @@
fdesc = pango_font_description_new();
/* song label */
- infobar->priv->song_label = lbl = exo_ellipsized_label_new("");
- exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(lbl),
- EXO_PANGO_ELLIPSIZE_END);
+ infobar->priv->song_label = lbl = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
pango_font_description_set_size(fdesc, size*PANGO_SCALE_LARGE);
gtk_widget_modify_font(lbl, fdesc);
@@ -102,9 +101,8 @@
gtk_box_pack_start(GTK_BOX(hbox), pbar, TRUE, TRUE, 0);
/* UI message label */
- infobar->priv->ui_message_label = lbl = exo_ellipsized_label_new("");
- exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(lbl),
- EXO_PANGO_ELLIPSIZE_END);
+ infobar->priv->ui_message_label = lbl = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
pango_font_description_set_size(fdesc, size);
gtk_widget_modify_font(lbl, fdesc);
Modified: xfmedia/branches/experimental/src/xfmedia-tray-icon.c
===================================================================
--- xfmedia/branches/experimental/src/xfmedia-tray-icon.c 2006-08-02
06:17:47 UTC (rev 22620)
+++ xfmedia/branches/experimental/src/xfmedia-tray-icon.c 2006-08-02
06:45:45 UTC (rev 22621)
@@ -98,7 +98,7 @@
g_object_ref(G_OBJECT(tray_icon));
gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &iw, &ih);
- pix = xfce_icon_theme_load(icon_theme, "xfmedia", iw);
+ pix = xfce_themed_icon_load("xfmedia", iw);
if(!pix) {
tmp = gdk_pixbuf_from_pixdata(&xfmedia_icon, TRUE, NULL);
if(tmp && gdk_pixbuf_get_width(tmp) == iw &&
gdk_pixbuf_get_height(tmp) == ih)
Modified: xfmedia/trunk/configure.ac
===================================================================
--- xfmedia/trunk/configure.ac 2006-08-02 06:17:47 UTC (rev 22620)
+++ xfmedia/trunk/configure.ac 2006-08-02 06:45:45 UTC (rev 22621)
@@ -100,11 +100,11 @@
AC_SUBST(LIBX11_LIBS)
dnl required
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.4.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
XDT_CHECK_PACKAGE([LIBXINE], [libxine], [1.0.0])
Modified: xfmedia/trunk/src/mainwin-callbacks.c
===================================================================
--- xfmedia/trunk/src/mainwin-callbacks.c 2006-08-02 06:17:47 UTC (rev
22620)
+++ xfmedia/trunk/src/mainwin-callbacks.c 2006-08-02 06:45:45 UTC (rev
22621)
@@ -324,9 +324,8 @@
gtk_widget_show(frame);
gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
- lbl = exo_ellipsized_label_new(filename);
- exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(lbl),
- EXO_PANGO_ELLIPSIZE_START);
+ lbl = gtk_label_new(filename);
+ gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_START);
gtk_label_set_selectable(GTK_LABEL(lbl), TRUE);
gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
gtk_label_set_text(GTK_LABEL(lbl), filename);
Modified: xfmedia/trunk/src/mainwin.c
===================================================================
--- xfmedia/trunk/src/mainwin.c 2006-08-02 06:17:47 UTC (rev 22620)
+++ xfmedia/trunk/src/mainwin.c 2006-08-02 06:45:45 UTC (rev 22621)
@@ -257,9 +257,9 @@
{
PangoFontDescription *fdesc;
- mwin->ui_message_label = exo_ellipsized_label_new("");
-
exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(mwin->ui_message_label),
- EXO_PANGO_ELLIPSIZE_END);
+ mwin->ui_message_label = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(mwin->ui_message_label),
+ PANGO_ELLIPSIZE_END);
gtk_misc_set_alignment(GTK_MISC(mwin->ui_message_label), 0.0, 0.5);
fdesc = pango_font_description_from_string("italic");
@@ -591,9 +591,8 @@
gtk_widget_show(lbl);
gtk_container_add(GTK_CONTAINER(evtbox), lbl);
- mwin->song_label = lbl = exo_ellipsized_label_new("");
- exo_ellipsized_label_set_ellipsize(EXO_ELLIPSIZED_LABEL(lbl),
- EXO_PANGO_ELLIPSIZE_END);
+ mwin->song_label = lbl = gtk_label_new("");
+ gtk_label_set_ellipsize(GTK_LABEL(lbl), PANGO_ELLIPSIZE_END);
gtk_label_set_markup(GTK_LABEL(lbl), "<span size=\"large\"> </span>");
gtk_label_set_use_markup(GTK_LABEL(lbl), TRUE);
gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
Modified: xfmedia/trunk/src/trayicon.c
===================================================================
--- xfmedia/trunk/src/trayicon.c 2006-08-02 06:17:47 UTC (rev 22620)
+++ xfmedia/trunk/src/trayicon.c 2006-08-02 06:45:45 UTC (rev 22621)
@@ -169,7 +169,7 @@
gtk_container_add(GTK_CONTAINER(tray_icon), evtbox);
gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &iw, &ih);
- pix = xfce_icon_theme_load(icon_theme, "xfmedia", iw);
+ pix = xfce_themed_icon_load("xfmedia", iw);
if(!pix) {
tmp = gdk_pixbuf_from_pixdata(&xfmedia_icon, TRUE, NULL);
if(tmp && gdk_pixbuf_get_width(tmp) == iw &&
gdk_pixbuf_get_height(tmp) == ih)
Modified: xfmedia/trunk/src/xfmedia-common.c
===================================================================
--- xfmedia/trunk/src/xfmedia-common.c 2006-08-02 06:17:47 UTC (rev 22620)
+++ xfmedia/trunk/src/xfmedia-common.c 2006-08-02 06:45:45 UTC (rev 22621)
@@ -52,14 +52,9 @@
#include "xfmedia-icon.h"
#include "mainwin.h"
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#include "gtk26-stock-icons.h"
-#endif
#include "xfmedia-stock-icons.h"
-XfceIconTheme *icon_theme = NULL;
-
GtkWidget *
xfmedia_custom_button_new_from_pixdata(const gchar *text,
const GdkPixdata *pixdata)
@@ -115,7 +110,7 @@
img = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
if(!img || gtk_image_get_storage_type(GTK_IMAGE(img)) ==
GTK_IMAGE_EMPTY) {
gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &iw, &ih);
- pix = xfce_icon_theme_load(icon_theme, icon, iw);
+ pix = xfce_themed_icon_load(icon, iw);
if(pix) {
if(img)
gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
@@ -210,11 +205,16 @@
void
xfmedia_init_icon_theme()
{
- if(icon_theme)
+ static gboolean __inited = FALSE;
+ GtkIconTheme *icon_theme;
+
+ if(__inited)
return;
- icon_theme = xfce_icon_theme_get_for_screen(NULL);
- xfce_icon_theme_prepend_search_path(icon_theme, DATADIR "/icons/");
+ icon_theme = gtk_icon_theme_get_default();
+ gtk_icon_theme_prepend_search_path(icon_theme, DATADIR "/icons/");
+
+ __inited = TRUE;
}
gchar *
@@ -610,6 +610,7 @@
smaller_stock_icon_load_internal(const gchar *stock_id, GtkIconSize size,
gint ratio)
{
+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
GdkPixbuf *pix;
GtkWidget *img;
Modified: xfmedia/trunk/src/xfmedia-common.h
===================================================================
--- xfmedia/trunk/src/xfmedia-common.h 2006-08-02 06:17:47 UTC (rev 22620)
+++ xfmedia/trunk/src/xfmedia-common.h 2006-08-02 06:45:45 UTC (rev 22621)
@@ -24,28 +24,15 @@
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/xfce-icontheme.h>
-
#define round(x) ( ((gdouble)x-(gint)x) >= 0.5000 ? ((gint)x)+1 : (gint)x )
#define BORDER 8
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#define GTK_STOCK_MEDIA_NEXT "gtk-media-next"
-#define GTK_STOCK_MEDIA_PAUSE "gtk-media-pause"
-#define GTK_STOCK_MEDIA_PLAY "gtk-media-play"
-#define GTK_STOCK_MEDIA_PREVIOUS "gtk-media-previous"
-#define GTK_STOCK_MEDIA_STOP "gtk-media-stop"
-#define GTK_STOCK_ABOUT "gtk-about"
-#define GTK_STOCK_DIRECTORY "gtk-directory"
-#endif
-
#define XFMEDIA_STOCK_VOLUME "xfmedia-volume"
#define AUTOHIDE_TIMEOUT 500
G_BEGIN_DECLS
-extern XfceIconTheme *icon_theme;
extern const GdkPixdata xfmedia_icon;
void xfmedia_init_icon_theme();
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
