[Xfce4-commits] xfce4-settings:bluesabre/display-settings Correct icon-name in identity-popups
Updating branch refs/heads/bluesabre/display-settings to 2babdcc9ffc59bf006f699b1e9ae8f484012a82c (commit) from bdda68c928af37c38e6982f2c6475c38d0f80340 (commit) commit 2babdcc9ffc59bf006f699b1e9ae8f484012a82c Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Oct 10 10:50:48 2012 +0200 Correct icon-name in identity-popups dialogs/display-settings/identity-popup.glade |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dialogs/display-settings/identity-popup.glade b/dialogs/display-settings/identity-popup.glade index 896ff80..da5d733 100644 --- a/dialogs/display-settings/identity-popup.glade +++ b/dialogs/display-settings/identity-popup.glade @@ -19,7 +19,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size48/property -property name=icon_namecomputer/property +property name=icon_namevideo-display/property property name=icon-size6/property /object packing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Also draw a white border without compositing
Updating branch refs/heads/bluesabre/display-settings
to 633a97e9edbda29b25f403a1f7540a72d11189e7 (commit)
from 2babdcc9ffc59bf006f699b1e9ae8f484012a82c (commit)
commit 633a97e9edbda29b25f403a1f7540a72d11189e7
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Oct 10 10:51:23 2012 +0200
Also draw a white border without compositing
dialogs/display-settings/main.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4b2cf8c..9b5aa69 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1024,6 +1024,9 @@ display_setting_identity_popup_expose(GtkWidget *popup,
GdkEventExpose *event, g
{
cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
cairo_paint (cr);
+cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+cairo_rectangle(cr, 0, 0, popup-allocation.width,
popup-allocation.height);
+cairo_stroke(cr);
}
/* Draw rounded corners. */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Spanish (Castilian) (es) translation to 99%
Updating branch refs/heads/master to 9633c00dbe5702f60b83817c8a0d6873470ac660 (commit) from 76f1a490c70d60fda6c69e27888dd1f93f890a4c (commit) commit 9633c00dbe5702f60b83817c8a0d6873470ac660 Author: prflr88 prfl...@gmail.com Date: Wed Oct 10 13:51:47 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 99% New status: 700 messages complete with 5 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/es.po b/po/es.po index 728a3ad..e257668 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid msgstr Project-Id-Version: Thunar 0.9.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-10-04 00:12+\n +POT-Creation-Date: 2012-10-10 11:21+\n PO-Revision-Date: 2010-04-17 18:35+0100\n Last-Translator: Abel Martín Ruiz abel.martin.r...@gmail.com\n Language-Team: Spanish/ES xfce-i...@xfce.org\n @@ -822,43 +822,43 @@ msgstr Archivo msgid File Name msgstr Nombre de archivo -#: ../thunar/thunar-file.c:896 ../thunar/thunar-shortcuts-view.c:284 +#: ../thunar/thunar-file.c:908 ../thunar/thunar-shortcuts-view.c:284 #: ../thunar/thunar-window.c:323 msgid File System msgstr Sistema de archivos -#: ../thunar/thunar-file.c:1014 +#: ../thunar/thunar-file.c:1041 #, c-format msgid The root folder has no parent msgstr La carpeta raíz no tiene padre -#: ../thunar/thunar-file.c:1077 ../thunar/thunar-file.c:1348 +#: ../thunar/thunar-file.c:1104 ../thunar/thunar-file.c:1375 #, c-format msgid Failed to parse the desktop file: %s msgstr Fallo al analizar el archivo de escritorio: %s #. if the .desktop file is not secure, ask user what to do -#: ../thunar/thunar-file.c:1089 +#: ../thunar/thunar-file.c:1116 #, fuzzy msgid Untrusted application launcher msgstr Se lanzo una aplicación no de confianza -#: ../thunar/thunar-file.c:1114 +#: ../thunar/thunar-file.c:1141 #, c-format msgid No Exec field specified msgstr Campo Exec no especificado #. if the .desktop file is not secure, ask user what to do -#: ../thunar/thunar-file.c:1123 +#: ../thunar/thunar-file.c:1150 msgid Untrusted link launcher -msgstr +msgstr Se lanzó un enlace no de confianza -#: ../thunar/thunar-file.c:1139 +#: ../thunar/thunar-file.c:1166 #, c-format msgid No URL field specified msgstr Campo URL no especificado -#: ../thunar/thunar-file.c:1144 +#: ../thunar/thunar-file.c:1171 msgid Invalid desktop file msgstr Archivo de escritorio no válido @@ -1006,7 +1006,7 @@ msgstr ¿Desea omitirlo? msgid There is not enough space on the destination. Try to remove files to make space. -msgstr +msgstr Sin suficiente espacio en el destino. Pruebe a remover archivos para hacer más espacio. #. append the Open menu action #: ../thunar/thunar-launcher.c:168 ../thunar/thunar-launcher.c:810 @@ -2327,12 +2327,12 @@ msgstr Archivo _vacío msgid Error while copying to \%s\: %s more space is required to copy to the destination -msgstr +msgstr Error al copiar a \%s\: %s más espacio es necesario en el destino #: ../thunar/thunar-transfer-job.c:744 #, c-format msgid Error while copying to \%s\: The destination is read-only -msgstr +msgstr Error al copiar a \%s\: El destino es de solo lectura #: ../thunar/thunar-transfer-job.c:787 msgid Collecting files... ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] mousepad:master l10n: Updated Spanish (Castilian) (es) translation to 100%
Updating branch refs/heads/master to 3ed593ad607379c965b873a0ae97dcb0aebc101a (commit) from ee3b368ca4569489acecb6a06598d639ed2ead1b (commit) commit 3ed593ad607379c965b873a0ae97dcb0aebc101a Author: prflr88 prfl...@gmail.com Date: Wed Oct 10 14:02:34 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 247 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po | 21 - 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/po/es.po b/po/es.po index a2dd7fc..f1a9ccd 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: mousepad\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-10-10 00:00+\n +POT-Creation-Date: 2012-10-10 10:42+\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: Spanish/es xfce-i...@xfce.org\n @@ -500,7 +500,9 @@ msgstr Línea: %d Columna: %d msgid Unable to create base directory \%s\. Saving to file \%s\ will be aborted. -msgstr No se puede crear el directorio base «%s». Se cancelará el guardado del archivo «%s». +msgstr +No se puede crear el directorio base «%s». Se cancelará el guardado del +archivo «%s». #. print error #: ../mousepad/mousepad-util.c:618 @@ -734,7 +736,7 @@ msgstr a _mayúsculas #: ../mousepad/mousepad-window.c:442 msgid Change the case of the selection to uppercase -msgstr +msgstr Cambiar el tipo de sensibilidad de la selección a mayúscula #: ../mousepad/mousepad-window.c:443 msgid to _Lowercase @@ -742,23 +744,23 @@ msgstr a m_inúsculas #: ../mousepad/mousepad-window.c:443 msgid Change the case of the selection to lowercase -msgstr +msgstr Cambiar el tipo de sensibilidad de la seleccionada a minúscula #: ../mousepad/mousepad-window.c:444 msgid to _Title Case -msgstr +msgstr A la sensibilidad del _Título #: ../mousepad/mousepad-window.c:444 msgid Change the case of the selection to title case -msgstr +msgstr Cambiar la sensibilidad de la selección a la del título #: ../mousepad/mousepad-window.c:445 msgid to _Opposite Case -msgstr +msgstr Al tipo de sensibilidad _opuesto #: ../mousepad/mousepad-window.c:445 msgid Change the case of the selection opposite case -msgstr +msgstr Cambiar el tipo de sensibilidad de la selección al opuesto #: ../mousepad/mousepad-window.c:446 msgid _Tabs to Spaces @@ -766,7 +768,8 @@ msgstr _Tabulaciones a espacios #: ../mousepad/mousepad-window.c:446 msgid Convert all tabs to spaces in the selection or document -msgstr Convertir todas las tabulaciones a espacios en la selección o el documento +msgstr +Convertir todas las tabulaciones a espacios en la selección o el documento #: ../mousepad/mousepad-window.c:447 msgid _Spaces to Tabs ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] mousepad:master l10n: Updated Spanish (Castilian) (es) translation to 100%
Updating branch refs/heads/master to 82edeaee2ec9fd97872264dbb2baae5aea6c091e (commit) from 3ed593ad607379c965b873a0ae97dcb0aebc101a (commit) commit 82edeaee2ec9fd97872264dbb2baae5aea6c091e Author: prflr88 prfl...@gmail.com Date: Wed Oct 10 14:03:46 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 247 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/es.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/es.po b/po/es.po index f1a9ccd..de8d09c 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgstr #: ../mousepad/main.c:53 msgid Do not register with the D-BUS session message bus -msgstr No registrar con el bus de mensajes de sesión D-BUS +msgstr No registrar con el bus de mensajes de la sesión D-BUS #: ../mousepad/main.c:54 msgid Quit a running Mousepad instance ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Fix build with --enable-gtk-doc.
Updating branch refs/heads/master to a7e2fd2794c83b58d451849735248eba368f1e72 (commit) from d2b46f86dde38e8608bd9f3e9dac995f0be962ac (commit) commit a7e2fd2794c83b58d451849735248eba368f1e72 Author: Jérôme Guelfucci jero...@xfce.org Date: Wed Oct 10 14:13:31 2012 +0200 Fix build with --enable-gtk-doc. The documentation generation might still need to be ported to also generate documentation for GTK+ 3. docs/Makefile.am |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index a64d138..944f834 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -49,12 +49,12 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK2_CFLAGS) \ $(GTK_DOC_EXTRA_CFLAGS) GTKDOC_LIBS = \ $(LIBXFCE4UTIL_LIBS)\ - $(GTK_LIBS) \ + $(GTK2_LIBS)\ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la include $(top_srcdir)/gtk-doc.make ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskbar-plugin:master Replaced the primary popup menu with a hover menu, still some instabilties in the code.
Updating branch refs/heads/master
to cce5b5e9b27f4e057ab50d1f57c88afe0861d4f3 (commit)
from 8ec01766e0861a2cccaab6c2b390c2fe7b2547bb (commit)
commit cce5b5e9b27f4e057ab50d1f57c88afe0861d4f3
Author: Gearoid Murphy gearoid.mur...@hp.com
Date: Wed Oct 10 14:53:14 2012 +0100
Replaced the primary popup menu with a hover menu, still some instabilties
in the code.
README |1 -
taskbar-widget.c | 110 +-
2 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/README b/README
index 0ebfa35..3bc9c56 100644
--- a/README
+++ b/README
@@ -37,7 +37,6 @@
3) If there are multiple application instances running, a list to
the application windows is shown
-
** Known Issues ***
diff --git a/taskbar-widget.c b/taskbar-widget.c
index 476e14f..1a3be0a 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -243,8 +243,7 @@ static void xfce_taskbar_group_button_add_window
(XfceTaskBarGrou
static gboolean xfce_taskbar_group_button_enter_event (GtkWidget
*button, GdkEvent *event, XfceTaskBarGroup *group);
static gboolean xfce_taskbar_group_button_leave_event (GtkWidget
*button, GdkEvent *event, XfceTaskBarGroup *group);
-static XfceTaskBarGroup*
-xfce_taskbar_group_button_new (const char *,
XfceTaskBar *taskbar);
+static XfceTaskBarGroup* xfce_taskbar_group_button_new (const char *,
XfceTaskBar *taskbar);
// pinning functions
static void xfce_taskbar_group_button_toggle_pinned (XfceTaskBarGroup
*group);
@@ -254,7 +253,13 @@ static void xfce_taskbar_group_button_build_pin_menu
(XfceTaskBarGroup *g
static void cache_pinned_configuration (XfceTaskBar
*taskbar);
//hover menu functions
-static gboolean trigger_hover_menu_timeout(GtkWidget *widget, GdkEvent
*event, gpointer menu_ptr);
+static gboolean trigger_hover_menu_timeout(GtkWidget *widget, GdkEvent
*event, gpointer menu_ptr);
+static gboolean trigger_hover_menu_timeout(GtkWidget *widget, GdkEvent
*event, gpointer menu_ptr);
+static gboolean hover_menu_leave(GtkWidget *widget, GdkEvent *event, gpointer
menu_ptr);
+static gboolean hover_menu_enter(GtkWidget *widget, GdkEvent *event, gpointer
menu_ptr);
+static gboolean xfce_taskbar_hover_menu_timeout(gpointer menu_ptr);
+static gboolean xfce_taskbar_group_button_hover_timeout(gpointer group_ptr);
+static voidxfce_taskbar_activate_hover_menu(GtkWidget *widget,
XfceTaskBarGroup *group, size_t mouse_button);
// potential public functions
static void xfce_taskbar_set_include_all_workspaces (XfceTaskBar *taskbar,
gboolean all_workspaces);
@@ -2235,7 +2240,7 @@ static gboolean xfce_taskbar_group_button_release_event
(GtkWidget *button, GdkEventButton *event, XfceTaskBarGroup *group)
{
GtkWidget *panel_plugin;
-GtkWidget *menu;
+GtkWidget *menu_widget;
//Disable the timeout, if active
DISABLE_HOVER_TIMEOUT(group);
@@ -2264,6 +2269,20 @@ static gboolean xfce_taskbar_group_button_release_event
return TRUE;
}
+//Check if there's a hover menu active, if so, disable it
+GList *attached = gtk_menu_get_for_attach_widget(group-button);
+guint list_length = g_list_length(attached);
+size_t menu_source = 0 ;
+panel_assert (list_length = 1 There should only be at most one menu
attached to the icon!);
+if(list_length == 1)
+{
+GtkMenu *menu = attached-data;
+menu_source = (size_t)(g_object_get_data(G_OBJECT(menu),
menu-source));
+printf(menu_source: %zu\n, menu_source);
+g_signal_handlers_disconnect_by_func(group-button,
trigger_hover_menu_timeout, menu);
+gtk_widget_destroy (GTK_WIDGET(menu));
+}
+
//Middle mouse click on the taskbar icon launchs the icon
if(event-button == MIDMOUSE)
{
@@ -2271,7 +2290,7 @@ static gboolean xfce_taskbar_group_button_release_event
return TRUE ;
}
-//This is trying to do too much, need to prune it
+
if (event-button == LEFTMOUSE || event-button == RIGHTMOUSE)
{
GSList *li;
@@ -2291,17 +2310,22 @@ static gboolean xfce_taskbar_group_button_release_event
}
}
}
-/*
-if a single instance of a class window is visible to the taskbar,
-activate that instance instead of showing the associated group
menus,
-when a left mouse click falls on the icon
-*/
+
+// If a single instance of a class window is visible to the taskbar,
+// activate that instance instead of showing the associated group
menus,
+// when a left mouse click falls on the icon
if(active_child event-button == LEFTMOUSE)
{
xfce_taskbar_button_activate (active_child, event-time);
return TRUE ;
}
+
[Xfce4-commits] xfce4-mixer:master Fix broken Spanish translation
Updating branch refs/heads/master to 3c72b211a2c9222cee6dc6e998f63b443814030b (commit) from dc38f3c380ae300bbf2214baae54654c93f4b956 (commit) commit 3c72b211a2c9222cee6dc6e998f63b443814030b Author: Guido Berhoerster guido+x...@berhoerster.name Date: Wed Oct 10 16:58:38 2012 +0200 Fix broken Spanish translation po/es.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/es.po b/po/es.po index 27a8b80..a33a5ca 100644 --- a/po/es.po +++ b/po/es.po @@ -114,7 +114,7 @@ msgstr Mostrar versión y salir #: ../xfce4-mixer/main.c:130 #, c-format msgid xfce4-mixer: Failed to initialize xfconf: %s\n -msgstr xfce4-mixer: Fallo al inicializar xfconf: %s +msgstr xfce4-mixer: Fallo al inicializar xfconf: %s\n #: ../xfce4-mixer/xfce-mixer-container.c:218 msgid _Playback ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mixer:master Release 4.10.0
Updating branch refs/heads/master to b9bf9b56f9e02fa6e772dfce5cf161302d913ed6 (commit) from 3c72b211a2c9222cee6dc6e998f63b443814030b (commit) commit b9bf9b56f9e02fa6e772dfce5cf161302d913ed6 Author: Guido Berhoerster guido+x...@berhoerster.name Date: Wed Oct 10 16:59:35 2012 +0200 Release 4.10.0 NEWS|7 +++ configure.ac.in |4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1c6733c..089cd47 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.10.0 +== +- Do not use G_VALUE_INIT which is only available in glib = 2.30 +- Translation updates: Dutch (Flemish), Japanese, Croatian, Portuguese, Spanish + (Castilian), German, Indonesian, Ukrainian, Polish, Chinese (Taiwan) + + 4.9.0 = - Handle a negative minimal volume correctly. diff --git a/configure.ac.in b/configure.ac.in index 45fe951..35a5689 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -22,11 +22,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([xfce4_mixer_version_major], [4]) -m4_define([xfce4_mixer_version_minor], [9]) +m4_define([xfce4_mixer_version_minor], [10]) m4_define([xfce4_mixer_version_micro], [0]) m4_define([xfce4_mixer_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_mixer_version_build], [r@REVISION@]) -m4_define([xfce4_mixer_version_tag], [git]) +m4_define([xfce4_mixer_version_tag], []) m4_define([xfce4_mixer_version], [xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(), [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [git], [xfce4_mixer_version_tag()-xfce4_mixer_version_build()], [xfce4_mixer_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mixer:xfce-4.10 Creating branch xfce-4.10
Updating branch refs/heads/xfce-4.10 as new branch to 7bf8b274e81e80fdcd958ed082950ff5ae418830 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/xfce-4.10 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mixer|xfce4-mixer-4.10.0 Creating annotated tag xfce4-mixer-4.10.0
Updating annotated tag refs/tags/xfce4-mixer-4.10.0 as new annotated tag to 9def3165245d4c2670a8d922885d846bc8090b63 (tag) succeeds xfce4-mixer-4.9.0-18-g3c72b21 tagged by Guido Berhoerster guido+x...@berhoerster.name on 2012-10-10 16:59 +0200 Guido Berhoerster (1): Release 4.10.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Visual improvements to the identity-popup
Updating branch refs/heads/bluesabre/display-settings
to 89112673807e2915d38bf727bec69fab6fcbef69 (commit)
from 633a97e9edbda29b25f403a1f7540a72d11189e7 (commit)
commit 89112673807e2915d38bf727bec69fab6fcbef69
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Oct 10 18:27:21 2012 +0200
Visual improvements to the identity-popup
dialogs/display-settings/main.c | 87 +-
1 files changed, 75 insertions(+), 12 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 9b5aa69..0775ae8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1011,21 +1011,63 @@ display_setting_screen_changed(GtkWidget *widget,
GdkScreen *old_screen, gpointe
}
static gboolean
-display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event,
gpointer userdata)
+display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event,
gpointer has_selection)
{
cairo_t *cr = gdk_cairo_create(popup-window);
gint radius;
+gboolean selected = GPOINTER_TO_INT(has_selection);
+cairo_pattern_t *vertical_gradient, *innerstroke_gradient,
*selected_gradient, *selected_innerstroke_gradient;
-radius = 15;
+radius = 10;
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-
+
+/* Create the various gradients */
+ vertical_gradient = cairo_pattern_create_linear(0, 0, 0,
popup-allocation.height);
+ cairo_pattern_add_color_stop_rgb(vertical_gradient, 0, 0.25, 0.25,
0.25);
+ cairo_pattern_add_color_stop_rgb(vertical_gradient, 0.24, 0.15, 0.15,
0.15);
+ cairo_pattern_add_color_stop_rgb(vertical_gradient, 0.6, 0.0, 0.0, 0.0);
+
+ innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0,
popup-allocation.height);
+ cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0, 0.35, 0.35,
0.35);
+ cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.4, 0.25, 0.25,
0.25);
+ cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.7, 0.15, 0.15,
0.15);
+ cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.85, 0.0, 0.0,
0.0);
+
+ selected_gradient = cairo_pattern_create_linear(0, 0, 0,
popup-allocation.height);
+ cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.25,
0.45);
+ cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.15,
0.25);
+ cairo_pattern_add_color_stop_rgb(selected_gradient, 0.6, 0.05, 0.10,
0.20);
+ cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.05,
0.05);
+
+ selected_innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0,
popup-allocation.height);
+ cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0,
0.15, 0.45, 0.75);
+ cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0.7,
0.0, 0.15, 0.25);
+ cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0.85,
0.0, 0.0, 0.0);
+
/* Compositing is not available, so just set the background color. */
if (!supports_alpha)
{
-cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
+ /* Draw a filled rectangle with outline */
+ cairo_set_line_width(cr, 1.0);
+cairo_set_source(cr, vertical_gradient);
+if (selected) cairo_set_source(cr, selected_gradient);
cairo_paint (cr);
-cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
-cairo_rectangle(cr, 0, 0, popup-allocation.width,
popup-allocation.height);
+cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+cairo_rectangle(cr, 0.5, 0.5, popup-allocation.width-0.5,
popup-allocation.height-0.5);
+cairo_stroke(cr);
+
+/* Draw the inner stroke */
+cairo_set_source_rgb(cr, 0.35, 0.35, 0.35);
+if (selected) cairo_set_source_rgb(cr, 0.15, 0.45, 0.75);
+cairo_move_to(cr, 1.5, 1.5);
+cairo_line_to(cr, popup-allocation.width-1, 1.5);
+cairo_stroke(cr);
+cairo_set_source(cr, innerstroke_gradient);
+if (selected) cairo_set_source(cr, selected_innerstroke_gradient);
+cairo_move_to(cr, 1.5, 1.5);
+cairo_line_to(cr, 1.5, popup-allocation.height-1.0);
+cairo_move_to(cr, popup-allocation.width-1.5, 1.5);
+cairo_line_to(cr, popup-allocation.width-1.5,
popup-allocation.height-1.0);
cairo_stroke(cr);
}
@@ -1043,14 +1085,35 @@ display_setting_identity_popup_expose(GtkWidget *popup,
GdkEventExpose *event, g
cairo_line_to(cr, popup-allocation.width-0.5 - radius, 0.5);
cairo_arc(cr, popup-allocation.width-0.5 - radius, radius+0.5,
radius, 3.0*3.14/2.0, 0.0);
cairo_line_to(cr, popup-allocation.width-0.5,
popup-allocation.height+0.5);
-cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.9);
+cairo_set_source(cr, vertical_gradient);
+if (selected) cairo_set_source(cr,
[Xfce4-commits] xfce4-taskbar-plugin:master Minor tweaks, wnck sub-windows are untable for some reason...
Updating branch refs/heads/master
to fce21021c37133d9ad26ab7f0bfa2d4a7f341bb3 (commit)
from cce5b5e9b27f4e057ab50d1f57c88afe0861d4f3 (commit)
commit fce21021c37133d9ad26ab7f0bfa2d4a7f341bb3
Author: Gearoid Murphy gearoid.mur...@hp.com
Date: Wed Oct 10 17:52:14 2012 +0100
Minor tweaks, wnck sub-windows are untable for some reason...
taskbar-widget.c | 13 +
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/taskbar-widget.c b/taskbar-widget.c
index 1a3be0a..1f69bf9 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -187,10 +187,10 @@ struct _XfceTaskBarGroup
gboolean dragactive ;
gboolean pinned ;
gchar *command ;
-guint popup_timeout ;
+guint hover_timeout ;
};
-#define DISABLE_HOVER_TIMEOUT(group) if(group-popup_timeout != 0)
{g_source_remove(group-popup_timeout); group-popup_timeout=0;}
+#define DISABLE_HOVER_TIMEOUT(group) if(group-hover_timeout != 0)
{g_source_remove(group-hover_timeout); group-hover_timeout=0;}
static const GtkTargetEntry source_targets[] =
{
@@ -1611,7 +1611,7 @@ static gboolean xfce_taskbar_app_button_release_event
(GtkWidget *button, GdkEve
return FALSE ;
}
}
-else// if(event-button == 3)
+else// if(event-button == RIGHTMOUSE)
{
GtkWidget *menu ;
menu = wnck_action_menu_new (child-window); g_signal_connect
(G_OBJECT (menu), selection-done, G_CALLBACK (gtk_widget_destroy), NULL);
@@ -2466,7 +2466,6 @@ static gboolean
xfce_taskbar_group_button_hover_timeout(gpointer group_ptr)
//Triggered when the mouse exits the group button icon
static gboolean xfce_taskbar_group_button_leave_event(GtkWidget *button,
GdkEvent *event, XfceTaskBarGroup *group)
{
-//printf(xfce_taskbar_group_button_leave_event\n);
DISABLE_HOVER_TIMEOUT(group);
return FALSE ;
}
@@ -2474,12 +2473,10 @@ static gboolean
xfce_taskbar_group_button_leave_event(GtkWidget *button, GdkEven
//Triggered when the mouse enters the group button icon
static gboolean xfce_taskbar_group_button_enter_event(GtkWidget *button,
GdkEvent *event, XfceTaskBarGroup *group)
{
-//printf(xfce_taskbar_group_button_enter_event\n);
if(xfce_taskbar_group_visible_count(group,
wnck_screen_get_active_workspace (group-taskbar-screen)) 0)
{
-group-popup_timeout = g_timeout_add(250,
xfce_taskbar_group_button_hover_timeout, group);
+group-hover_timeout = g_timeout_add(250,
xfce_taskbar_group_button_hover_timeout, group);
}
-
return TRUE ;
}
@@ -2607,7 +2604,7 @@ static XfceTaskBarGroup * xfce_taskbar_group_button_new
(const char *group_name,
group-command = NULL ;
//The timeout id, used when tracking a mouse hovering over the button
-group-popup_timeout = 0 ;
+group-hover_timeout = 0 ;
group-button = xfce_arrow_button_new (GTK_ARROW_NONE);
gtk_widget_set_parent (group-button, GTK_WIDGET (taskbar));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskbar-plugin:master Added some logic to make the button 'press' visually.
Updating branch refs/heads/master
to 18be87d7c47f92ff99f9f4aa94e9b11269e4b3a6 (commit)
from fce21021c37133d9ad26ab7f0bfa2d4a7f341bb3 (commit)
commit 18be87d7c47f92ff99f9f4aa94e9b11269e4b3a6
Author: Gearoid Murphy gear...@murphy.com
Date: Wed Oct 10 20:24:50 2012 +0100
Added some logic to make the button 'press' visually.
taskbar-widget.c | 18 ++
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/taskbar-widget.c b/taskbar-widget.c
index 1f69bf9..ca3d4c1 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -1061,7 +1061,6 @@ static void xfce_taskbar_window_added (WnckScreen
*screen, WnckWindow *window, X
gtk_widget_queue_resize (GTK_WIDGET (taskbar));
}
-
static void xfce_taskbar_window_removed (WnckScreen *screen, WnckWindow
*window, XfceTaskBar *taskbar)
{
GList *li;
@@ -1118,8 +1117,6 @@ static void xfce_taskbar_window_removed (WnckScreen
*screen, WnckWindow *window,
}
-
-
static void xfce_taskbar_viewports_changed (WnckScreen *screen, XfceTaskBar
*taskbar)
{
WnckWorkspace *active_ws;
@@ -1134,8 +1131,6 @@ static void xfce_taskbar_viewports_changed (WnckScreen
*screen, XfceTaskBar *tas
xfce_taskbar_active_workspace_changed (screen, active_ws, taskbar);
}
-
-
static void xfce_taskbar_skipped_windows_state_changed (WnckWindow *window,
WnckWindowState changed_state, WnckWindowState new_state, XfceTaskBar *taskbar)
{
panel_return_if_fail (XFCE_IS_taskbar (taskbar));
@@ -1154,7 +1149,6 @@ static void xfce_taskbar_skipped_windows_state_changed
(WnckWindow *window, Wnck
}
}
-
static gboolean xfce_taskbar_update_icon_geometries (gpointer data)
{
XfceTaskBar *taskbar = XFCE_taskbar (data);
@@ -1378,8 +1372,6 @@ static inline gboolean xfce_taskbar_button_visible
(XfceTaskBarWNode *child, Wnc
return FALSE;
}
-
-
static void xfce_taskbar_button_icon_changed (WnckWindow *window,
XfceTaskBarWNode *child)
{
GdkPixbuf *pixbuf;
@@ -2235,6 +2227,14 @@ static void
xfce_taskbar_group_button_menu_destroy(GtkWidget *menu, XfceTaskBarG
#endif
}
+
+static gboolean xfce_taskbar_group_button_press_event
+(GtkWidget *button, GdkEventButton *event, XfceTaskBarGroup *group)
+{
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (group-button), TRUE);
+return TRUE ;
+}
+
// This function handles all the logic for mouse button relase on the taskbar
icons
static gboolean xfce_taskbar_group_button_release_event
(GtkWidget *button, GdkEventButton *event, XfceTaskBarGroup *group)
@@ -2242,6 +2242,7 @@ static gboolean xfce_taskbar_group_button_release_event
GtkWidget *panel_plugin;
GtkWidget *menu_widget;
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (group-button), FALSE);
//Disable the timeout, if active
DISABLE_HOVER_TIMEOUT(group);
@@ -2614,6 +2615,7 @@ static XfceTaskBarGroup * xfce_taskbar_group_button_new
(const char *group_name,
gtk_container_add( GTK_CONTAINER(group-align), group-icon);
gtk_container_add (GTK_CONTAINER (group-button), group-align);
+g_signal_connect (G_OBJECT (group-button), button-press-event,
G_CALLBACK (xfce_taskbar_group_button_press_event), group);
g_signal_connect (G_OBJECT (group-button), button-release-event,
G_CALLBACK (xfce_taskbar_group_button_release_event), group);
g_signal_connect(G_OBJECT(group-button), enter-notify-event,
G_CALLBACK(xfce_taskbar_group_button_enter_event), group);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskbar-plugin:master Added some logic to blick the icon of a starting application, this at least informs the user than an action is pending.
Updating branch refs/heads/master to 0e3991035fa31030cbb546c2d6b587055fda5ae9 (commit) from 18be87d7c47f92ff99f9f4aa94e9b11269e4b3a6 (commit) commit 0e3991035fa31030cbb546c2d6b587055fda5ae9 Author: Gearoid Murphy gear...@murphy.com Date: Wed Oct 10 20:35:23 2012 +0100 Added some logic to blick the icon of a starting application, this at least informs the user than an action is pending. taskbar-widget.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/taskbar-widget.c b/taskbar-widget.c index ca3d4c1..878c991 100644 --- a/taskbar-widget.c +++ b/taskbar-widget.c @@ -1053,6 +1053,8 @@ static void xfce_taskbar_window_added (WnckScreen *screen, WnckWindow *window, X g_hash_table_insert (taskbar-groups, (gpointer)group-window_class_name, group); } +xfce_arrow_button_set_blinking(XFCE_ARROW_BUTTON (group-button), FALSE); + wnode-group = group ; // add window to the group button @@ -2072,6 +2074,8 @@ static void xfce_taskbar_group_button_launch_pinned (XfceTaskBarGroup *group) return ; } +// +xfce_arrow_button_set_blinking (XFCE_ARROW_BUTTON (group-button), TRUE); } static void xfce_taskbar_group_button_toggle_pinned (XfceTaskBarGroup *group) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Drop unused MIME opening and legacy fallbacks
Updating branch refs/heads/master
to 6c141b995d6a963e3466f8fd6c8b90bf6c2aa17f (commit)
from 2ce61c66680c8e7db1cba2b1cbc82e0b60f3f1eb (commit)
commit 6c141b995d6a963e3466f8fd6c8b90bf6c2aa17f
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Oct 10 20:16:48 2012 +0200
Drop unused MIME opening and legacy fallbacks
midori/sokoke.c | 103 +++
1 files changed, 5 insertions(+), 98 deletions(-)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 1257190..cffb131 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -124,13 +124,7 @@ sokoke_message_dialog (GtkMessageType message_type,
gboolean modal)
{
GtkWidget* dialog = gtk_message_dialog_new (
-NULL, 0, message_type,
-#if HAVE_HILDON
-GTK_BUTTONS_NONE,
-#else
-GTK_BUTTONS_OK,
-#endif
-%s, short_message);
+NULL, 0, message_type, GTK_BUTTONS_OK, %s, short_message);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
%s, detailed_message);
if (modal)
@@ -147,83 +141,6 @@ sokoke_message_dialog (GtkMessageType message_type,
}
-/**
- * sokoke_show_uri_with_mime_type:
- * @screen: a #GdkScreen, or %NULL
- * @uri: the URI to show
- * @mime_type: a MIME type
- * @timestamp: the timestamp of the event
- * @error: the location of a #GError, or %NULL
- *
- * Shows the specified URI with an appropriate application,
- * as though it had the specified MIME type.
- *
- * On Maemo, hildon_mime_open_file_with_mime_type() is used.
- *
- * See also: sokoke_show_uri().
- *
- * Return value: %TRUE on success, %FALSE if an error occurred
- **/
-gboolean
-sokoke_show_uri_with_mime_type (GdkScreen* screen,
-const gchar* uri,
-const gchar* mime_type,
-guint32 timestamp,
-GError** error)
-{
-gboolean success;
-#if HAVE_HILDON
-osso_context_t* osso;
-DBusConnection* dbus;
-
-osso = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL);
-if (!osso)
-{
-g_print (Failed to initialize libosso\n);
-return FALSE;
-}
-
-dbus = (DBusConnection *) osso_get_dbus_connection (osso);
-if (!dbus)
-{
-osso_deinitialize (osso);
-g_print (Failed to get dbus connection from osso context\n);
-return FALSE;
-}
-
-success = (hildon_mime_open_file_with_mime_type (dbus,
- uri, mime_type) == 1);
-osso_deinitialize (osso);
-#else
-GFile* file = g_file_new_for_uri (uri);
-gchar* content_type;
-GAppInfo* app_info;
-GList* files;
-gpointer context;
-
-content_type = g_content_type_from_mime_type (mime_type);
-app_info = g_app_info_get_default_for_type (content_type,
-!g_str_has_prefix (uri, file://));
-g_free (content_type);
-files = g_list_prepend (NULL, file);
-#if GTK_CHECK_VERSION (3, 0, 0)
-context = gdk_display_get_app_launch_context (gdk_screen_get_display
(screen));
-#else
-context = gdk_app_launch_context_new ();
-#endif
-gdk_app_launch_context_set_screen (context, screen);
-gdk_app_launch_context_set_timestamp (context, timestamp);
-
-success = g_app_info_launch (app_info, files, context, error);
-
-g_object_unref (app_info);
-g_list_free (files);
-g_object_unref (file);
-#endif
-
-return success;
-}
-
static void
sokoke_open_with_response_cb (GtkWidget* dialog,
gint response,
@@ -273,13 +190,9 @@ sokoke_default_for_uri (const gchar* uri,
* @timestamp: the timestamp of the event
* @error: the location of a #GError, or %NULL
*
- * Shows the specified URI with an appropriate application. This
- * supports xdg-open, exo-open and gnome-open as fallbacks if
- * GIO doesn't do the trick.
+ * Shows the specified URI with an application or xdg-open.
* x-scheme-handler is supported for GLib 2.28 as of 0.3.3.
*
- * On Maemo, hildon_uri_open() is used.
- *
* Return value: %TRUE on success, %FALSE if an error occurred
**/
gboolean
@@ -288,11 +201,7 @@ sokoke_show_uri (GdkScreen* screen,
guint32 timestamp,
GError** error)
{
-#if HAVE_HILDON
-HildonURIAction* action = hildon_uri_get_default_action_by_uri (uri, NULL);
-return hildon_uri_open (uri, action, error);
-
-#elif defined (G_OS_WIN32)
+#ifdef G_OS_WIN32
CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
SHELLEXECUTEINFO info = { sizeof (info) };
info.nShow = SW_SHOWNORMAL;
@@ -305,8 +214,6 @@ sokoke_show_uri (GdkScreen* screen,
GAppInfo* info;
gchar* scheme;
#endif
-const gchar* fallbacks [] = { xdg-open, exo-open, gnome-open };
-gsize i;
GtkWidget* dialog;
GtkWidget* box;
[Xfce4-commits] midori:master Rename midori_findbar_find_text/continue and always highlight matches
Updating branch refs/heads/master
to ef7fa4aca51ef43082ff9454700b48254329a202 (commit)
from 6c141b995d6a963e3466f8fd6c8b90bf6c2aa17f (commit)
commit ef7fa4aca51ef43082ff9454700b48254329a202
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Oct 10 21:23:36 2012 +0200
Rename midori_findbar_find_text/continue and always highlight matches
midori/midori-browser.c |8 +++--
midori/midori-tab.vala| 12 ---
midori/midori-view.c | 35 ++
toolbars/midori-findbar.c | 89 +
toolbars/midori-findbar.h | 10 ++
5 files changed, 36 insertions(+), 118 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index bb17895..c45ec23 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2731,21 +2731,23 @@ static void
_action_find_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_findbar_invoke (MIDORI_FINDBAR (browser-find));
+GtkWidget* view = midori_browser_get_current_tab (browser);
+midori_findbar_invoke (MIDORI_FINDBAR (browser-find),
+midori_view_get_selected_text (MIDORI_VIEW (view)));
}
static void
_action_find_next_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_findbar_find_text (MIDORI_FINDBAR (browser-find), NULL, TRUE);
+midori_findbar_continue (MIDORI_FINDBAR (browser-find), TRUE);
}
static void
_action_find_previous_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_findbar_find_text (MIDORI_FINDBAR (browser-find), NULL, FALSE);
+midori_findbar_continue (MIDORI_FINDBAR (browser-find), FALSE);
}
static void
diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index 8f67657..437e3ce 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -78,6 +78,8 @@ namespace Midori {
Since: 0.3.4
*/
public signal void detach_inspector (WebKit.WebView inspector_view);
+/* Allow the browser to provide the find bar */
+public signal void search_text (bool found, string typing);
public bool is_blank () {
return URI.is_blank (uri);
@@ -169,12 +171,12 @@ namespace Midori {
web_view.unmark_text_matches ();
}
-public void mark_text_matches (string text, bool case_sensitive) {
+public bool find (string text, bool case_sensitive, bool forward) {
+bool found = false;
+found = web_view.search_text (text, case_sensitive, forward, true);
web_view.mark_text_matches (text, case_sensitive, 0);
-}
-
-public void set_highlight_text_matches (bool highlight) {
-web_view.set_highlight_text_matches (highlight);
+web_view.set_highlight_text_matches (true);
+return found;
}
}
}
diff --git a/midori/midori-view.c b/midori/midori-view.c
index c5eabd7..8d7be7e 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -153,7 +153,6 @@ enum {
NEW_WINDOW,
NEW_VIEW,
DOWNLOAD_REQUESTED,
-SEARCH_TEXT,
ADD_BOOKMARK,
LAST_SIGNAL
@@ -279,30 +278,6 @@ midori_view_class_init (MidoriViewClass* class)
G_TYPE_OBJECT);
/**
- * MidoriView::search-text:
- * @view: the object on which the signal is emitted
- * @found: whether the search was successful
- * @typing: whether the search was initiated by typing
- *
- * Emitted when a search is performed. Either manually
- * invoked or automatically by typing. The value of typing
- * is actually the text the user typed.
- *
- * Note that in 0.1.3 the argument @typing was introduced.
- */
-signals[SEARCH_TEXT] = g_signal_new (
-search-text,
-G_TYPE_FROM_CLASS (class),
-(GSignalFlags)(G_SIGNAL_RUN_LAST),
-0,
-0,
-NULL,
-midori_cclosure_marshal_VOID__BOOLEAN_STRING,
-G_TYPE_NONE, 2,
-G_TYPE_BOOLEAN,
-G_TYPE_STRING);
-
-/**
* MidoriView::add-bookmark:
* @view: the object on which the signal is emitted
* @uri: the bookmark URI
@@ -1939,7 +1914,7 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
midori_findbar_search_text (MIDORI_FINDBAR (view-overlay_find),
(GtkWidget*)view, TRUE, katze_str_non_null (text));
#else
-g_signal_emit (view, signals[SEARCH_TEXT], 0, TRUE, text ? text : );
+g_signal_emit_by_name (view, search-text, TRUE, katze_str_non_null
(text));
#endif
g_free (text);
return TRUE;
@@ -5201,14 +5176,12 @@ midori_view_search_text (MidoriView* view,
if (gtk_widget_get_visible (view-overlay_find))
{
text = midori_findbar_get_text (MIDORI_FINDBAR (view-overlay_find));
-webkit_web_view_search_text (WEBKIT_WEB_VIEW (view-web_view),
-
[Xfce4-commits] midori:master Introduce inject_stylesheet which uses DOM or JS
Updating branch refs/heads/master
to a8a370207dd44eb2ddf01bffad53137576e84122 (commit)
from ef7fa4aca51ef43082ff9454700b48254329a202 (commit)
commit a8a370207dd44eb2ddf01bffad53137576e84122
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 11 00:18:22 2012 +0200
Introduce inject_stylesheet which uses DOM or JS
Update included vapi which we ship for older Vala.
midori/midori-browser.c | 22 +--
midori/midori-tab.vala| 23 +++
midori/midori-view.c | 17 ++
midori/webkitgtk-3.0.vapi | 148 +
wscript |1 +
5 files changed, 178 insertions(+), 33 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index c45ec23..ff1d7c1 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3568,8 +3568,6 @@ _action_readable_activate (GtkAction* action,
gchar* filename;
gchar* stylesheet;
gint i;
-gchar* script;
-gchar* exception;
if (!view)
return;
@@ -3603,26 +3601,8 @@ _action_readable_activate (GtkAction* action,
i++;
}
-script = g_strdup_printf (
-(function () {
-var style = document.createElement ('style');
-style.setAttribute ('type', 'text/css');
-style.appendChild (document.createTextNode ('%s'));
-var head = document.getElementsByTagName ('head')[0];
-if (head) head.appendChild (style);
-else document.documentElement.insertBefore
-(style, document.documentElement.firstChild);
-}) ();, stylesheet);
+midori_tab_inject_stylesheet (MIDORI_TAB (view), stylesheet);
g_free (stylesheet);
-exception = NULL;
-if (!midori_view_execute_script (MIDORI_VIEW (view), script, exception))
-{
-midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_ERROR,
-exception, NULL, view,
-GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
-g_free (exception);
-}
-g_free (script);
}
static gboolean
diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index 437e3ce..d70e9c3 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -95,6 +95,29 @@ namespace Midori {
web_view.load_uri ();
}
+public void inject_stylesheet (string stylesheet) {
+#if HAVE_DOM
+var dom = web_view.get_dom_document ();
+var style = dom.create_element (style);
+style.set_attribute (type, text/css);
+style.append_child (dom.create_text_node (stylesheet));
+return_if_fail (dom.head != null);
+dom.head.append_child (style);
+#else
+web_view.execute_script (
+(function () {
+var style = document.createElement ('style');
+style.setAttribute ('type', 'text/css');
+style.appendChild (document.createTextNode ('%s'));
+var head = document.getElementsByTagName ('head')[0];
+if (head) head.appendChild (style);
+else document.documentElement.insertBefore
+(style, document.documentElement.firstChild);
+}) ();
+.printf (stylesheet));
+#endif
+}
+
public bool can_view_source () {
if (is_blank () || special)
return false;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 8d7be7e..377e1b4 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1732,26 +1732,19 @@ handle_link_hints (WebKitWebView* web_view,
if (view-find_links 0)
{
/* Links are currently off, turn them on */
-result = sokoke_js_script_eval (js_context,
- var style_func = (function (selector, rule) {
- var style = document.createElement ('style');
- style.setAttribute ('type', 'text/css');
- var heads = document.getElementsByTagName ('head');
- heads[0].appendChild (style);
- document.styleSheets[0].insertRule (selector + ' ' + rule);
- } );
- style_func ('.midoriHKD87346', '{
+midori_tab_inject_stylesheet (MIDORI_TAB (view), .midoriHKD87346 {
font-size:small !important; font-weight:bold !important;
z-index:500; border-radius:0.3em; line-height:1 !important;
background: white !important; color: black !important;
border:1px solid gray; padding:0 0.1em !important;
- position:absolute; display:inline !important; }');
- style_func ('.midori_access_key_fc04de', '{
+ position:absolute; display:inline !important; });
+midori_tab_inject_stylesheet (MIDORI_TAB (view),
.midori_access_key_fc04de {
font-size:small !important; font-weight:bold !important;
z-index:500; border-radius:0.3em; line-height:1
[Xfce4-commits] midori:master Move webview into Tab class and drop unused getters
Updating branch refs/heads/master
to 2ce61c66680c8e7db1cba2b1cbc82e0b60f3f1eb (commit)
from 5c3622797ac5aaf077d44a3dfc47ad0ed5d233aa (commit)
commit 2ce61c66680c8e7db1cba2b1cbc82e0b60f3f1eb
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Oct 10 20:05:35 2012 +0200
Move webview into Tab class and drop unused getters
extensions/delayed-load.vala |3 +-
midori/midori-browser.c | 50 +-
midori/midori-tab.vala | 55 ++
midori/midori-view.c | 405 +++---
midori/midori-view.h | 27 ---
midori/midori.vapi |4 -
tests/tab.vala |5 +
toolbars/midori-findbar.c| 10 +-
8 files changed, 95 insertions(+), 464 deletions(-)
diff --git a/extensions/delayed-load.vala b/extensions/delayed-load.vala
index 546bdcc..066a245 100644
--- a/extensions/delayed-load.vala
+++ b/extensions/delayed-load.vala
@@ -158,8 +158,7 @@ namespace DelayedLoad {
int64 delay = item.get_meta_integer (delay);
if (delay != Midori.Delay.DELAYED) {
-unowned WebKit.WebView web_view = view.get_web_view ();
-WebKit.LoadStatus load_status = web_view.load_status;
+WebKit.LoadStatus load_status = view.web_view.load_status;
if (load_status == WebKit.LoadStatus.FINISHED) {
if (this.timeout != 0)
this.tasks.set (browser, new TabShaker (browser));
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5fd5806..bb17895 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -322,7 +322,7 @@ _midori_browser_update_interface (MidoriBrowser* browser,
GtkAction* action;
_action_set_sensitive (browser, Back, midori_view_can_go_back (view));
-_action_set_sensitive (browser, Forward, midori_view_can_go_forward
(view));
+_action_set_sensitive (browser, Forward, midori_tab_can_go_forward
(MIDORI_TAB (view)));
_action_set_sensitive (browser, Previous,
midori_view_get_previous_page (view) != NULL);
_action_set_sensitive (browser, Next,
@@ -330,7 +330,7 @@ _midori_browser_update_interface (MidoriBrowser* browser,
_action_set_sensitive (browser, AddSpeedDial, !midori_view_is_blank
(view));
_action_set_sensitive (browser, BookmarkAdd, !midori_view_is_blank
(view));
-_action_set_sensitive (browser, SaveAs, midori_view_can_save (view));
+_action_set_sensitive (browser, SaveAs, midori_tab_can_save (MIDORI_TAB
(view)));
_action_set_sensitive (browser, ZoomIn, midori_view_can_zoom_in (view));
_action_set_sensitive (browser, ZoomOut, midori_view_can_zoom_out
(view));
_action_set_sensitive (browser, ZoomNormal,
@@ -341,7 +341,7 @@ _midori_browser_update_interface (MidoriBrowser* browser,
midori_tab_can_view_source (MIDORI_TAB (view)));
action = _action_by_name (browser, NextForward);
-if (midori_view_can_go_forward (view))
+if (midori_tab_can_go_forward (MIDORI_TAB (view)))
{
g_object_set (action,
stock-id, GTK_STOCK_GO_FORWARD,
@@ -602,7 +602,7 @@ midori_view_notify_uri_cb (GtkWidget* widget,
GtkAction* action = _action_by_name (browser, Location);
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
_action_set_sensitive (browser, Back, midori_view_can_go_back
(view));
-_action_set_sensitive (browser, Forward, midori_view_can_go_forward
(view));
+_action_set_sensitive (browser, Forward, midori_tab_can_go_forward
(MIDORI_TAB (view)));
}
}
@@ -1104,15 +1104,6 @@ midori_browser_save_uri (MidoriBrowser* browser,
}
static void
-midori_view_save_as_cb (GtkWidget* menuitem,
-const gchar* uri,
-GtkWidget* view)
-{
-MidoriBrowser* browser = midori_browser_get_for_widget (view);
-midori_browser_save_uri (browser, MIDORI_VIEW (view), uri);
-}
-
-static void
midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial,
MidoriBrowser* browser)
{
@@ -1138,19 +1129,6 @@ midori_browser_add_speed_dial (MidoriBrowser* browser)
}
}
-
-static void
-midori_view_add_speed_dial_cb (GtkWidget* menuitem,
- const gchar* uri,
- GtkWidget* view)
-{
-MidoriBrowser* browser;
-
-browser = midori_browser_get_for_widget (menuitem);
-midori_browser_add_speed_dial (browser);
-}
-
-
static gboolean
midori_browser_tab_leave_notify_event_cb (GtkWidget*widget,
GdkEventCrossing* event,
@@ -1161,14 +1139,6 @@ midori_browser_tab_leave_notify_event_cb (GtkWidget*
widget,
}
static void
-midori_view_activate_action_cb (GtkWidget* view,
-const gchar* action,
-
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Adjust the blue hue of the selection-highlight (thanks Pasi!)
Updating branch refs/heads/bluesabre/display-settings to 5577b06a31d7262d7c9ad03b8e0890c14870a716 (commit) from 89112673807e2915d38bf727bec69fab6fcbef69 (commit) commit 5577b06a31d7262d7c9ad03b8e0890c14870a716 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Oct 11 01:13:18 2012 +0200 Adjust the blue hue of the selection-highlight (thanks Pasi!) dialogs/display-settings/main.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 0775ae8..e32bd32 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1034,10 +1034,10 @@ display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event, g cairo_pattern_add_color_stop_rgb(innerstroke_gradient, 0.85, 0.0, 0.0, 0.0); selected_gradient = cairo_pattern_create_linear(0, 0, 0, popup-allocation.height); - cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.25, 0.45); - cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.15, 0.25); + cairo_pattern_add_color_stop_rgb(selected_gradient, 0, 0.05, 0.20, 0.46); + cairo_pattern_add_color_stop_rgb(selected_gradient, 0.4, 0.05, 0.12, 0.25); cairo_pattern_add_color_stop_rgb(selected_gradient, 0.6, 0.05, 0.10, 0.20); - cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.05, 0.05); + cairo_pattern_add_color_stop_rgb(selected_gradient, 0.8, 0.0, 0.02, 0.05); selected_innerstroke_gradient = cairo_pattern_create_linear(0, 0, 0, popup-allocation.height); cairo_pattern_add_color_stop_rgb(selected_innerstroke_gradient, 0, 0.15, 0.45, 0.75); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Fixed DnD markers with non-square small items.
Updating branch refs/heads/master
to 478c43e89b291e89f726d43a861e1266e0fa5905 (commit)
from 35086017fa0e7b87f2b51755c3e61a89a31f5527 (commit)
commit 478c43e89b291e89f726d43a861e1266e0fa5905
Author: Andrzej ndrwr...@gmail.com
Date: Thu Oct 11 00:20:44 2012 +0100
Fixed DnD markers with non-square small items.
panel/panel-itembar.c | 89 +++--
1 files changed, 64 insertions(+), 25 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 142a718..98ffae1 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -21,6 +21,7 @@
#include config.h
#endif
+#include math.h
#include gtk/gtk.h
#include exo/exo.h
@@ -95,7 +96,7 @@ struct _PanelItembar
/* dnd support */
gint highlight_index;
- gint highlight_x, highlight_y;
+ gint highlight_x, highlight_y, highlight_length;
gboolean highlight_small;
};
@@ -234,6 +235,7 @@ panel_itembar_init (PanelItembar *itembar)
itembar-size = 30;
itembar-nrows = 1;
itembar-highlight_index = -1;
+ itembar-highlight_length = -1;
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (itembar), GTK_NO_WINDOW);
@@ -702,12 +704,14 @@ panel_itembar_expose_event (GtkWidget *widget,
(!IS_HORIZONTAL (itembar) itembar-highlight_small))
{
rect.width = HIGHLIGHT_SIZE;
- rect.height = row_size;
+ rect.height = (itembar-highlight_length != -1) ?
+itembar-highlight_length : row_size;
}
else
{
rect.height = HIGHLIGHT_SIZE;
- rect.width = row_size;
+ rect.width = (itembar-highlight_length != -1) ?
+itembar-highlight_length : row_size;
}
/* draw highlight box */
@@ -1015,11 +1019,12 @@ panel_itembar_get_drop_index (PanelItembar *itembar,
gint x,
gint y)
{
- PanelItembarChild *child;
- GSList*li;
+ PanelItembarChild *child, *child2;
+ GSList*li, *li2;
GtkAllocation alloc;
- guint idx, col_start_idx;
- gint xr, yr;
+ guint idx, col_start_idx, col_end_idx;
+ gint xr, yr, col_width;
+ gdoubleaspect;
panel_return_val_if_fail (PANEL_IS_ITEMBAR (itembar), 0);
@@ -1037,15 +1042,19 @@ panel_itembar_get_drop_index (PanelItembar *itembar,
x = alloc.x + alloc.width || y = alloc.y + alloc.height)
return g_slist_length (itembar-children);
- for (li = itembar-children, idx = 0, col_start_idx = 0; li != NULL; li =
g_slist_next (li))
+ col_width = -1;
+ itembar-highlight_length = -1;
+ idx = 0;
+ col_start_idx = 0;
+ col_end_idx = 0;
+
+ for (li = itembar-children; li != NULL; li = g_slist_next (li))
{
child = li-data;
if (G_UNLIKELY (child == NULL))
continue;
- if (child-row == 0)
-col_start_idx = idx;
-
+ panel_assert (child-widget != NULL);
alloc = child-widget-allocation;
if (!IS_HORIZONTAL (itembar))
@@ -1053,31 +1062,61 @@ panel_itembar_get_drop_index (PanelItembar *itembar,
xr = x - alloc.x;
yr = y - alloc.y;
+
if (child-option == CHILD_OPTION_SMALL)
{
+ /* are we at the beginning of the column? */
+ if (child-row == 0)
+{
+ col_start_idx = idx;
+ col_end_idx = idx + 1;
+ col_width = alloc.width;
+ /* find the width of the current column and the idx of last item
*/
+ for (li2 = g_slist_next (li); li2 != NULL; li2 = g_slist_next
(li2))
+{
+ child2 = li2-data;
+ if (G_UNLIKELY (child2 == NULL))
+continue;
+ if (child2-row == 0)
+break;
+ panel_assert (child2-widget != NULL);
+ col_end_idx++;
+ if (IS_HORIZONTAL (itembar))
+col_width = MAX (col_width,
child2-widget-allocation.width);
+ else
+col_width = MAX (col_width,
child2-widget-allocation.height);
+}
+}
+
+ /* calculate aspect ratio */
+ if (alloc.height 0 col_width 0)
+aspect = (gdouble) col_width / (gdouble) alloc.height;
+ else
+aspect = 1.0;
+
/* before current column */
if (xr 0 ||
- (xr yr xr alloc.height - yr))
+ (xr (gint) round (yr * aspect)
+ xr (gint) round ((alloc.height - yr) * aspect)))
{
idx = col_start_idx;
break;
}
/* before current child */
- if (xr alloc.width xr = yr alloc.width - xr = yr)
-break;
+ if (xr col_width
+ xr = (gint) round
[Xfce4-commits] xfce4-places-plugin:master l10n: Updated Uyghur (ug) translation to 100%
Updating branch refs/heads/master to 6feb6ab70d00ac802f18b92832cffa202b69ad13 (commit) from e39d7ab7ea48d3578dadb132a58050720013a77a (commit) commit 6feb6ab70d00ac802f18b92832cffa202b69ad13 Author: Gheyret Kenji ghey...@yahoo.com Date: Thu Oct 11 04:15:31 2012 +0200 l10n: Updated Uyghur (ug) translation to 100% New status: 44 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 25 - 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/po/ug.po b/po/ug.po index 33c0f6e..2a99b41 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1,8 +1,8 @@ -# Uyghur translations for Thunar package. -# Copyright (C) 2004-2007 Benedikt Meurer. -# This file is distributed under the same license as the Thunar package. -# Gheyret T.Kenji ghey...@gmail.com, 2010. -# +# Uyghur translations for Thunar package. +# Copyright (C) 2004-2007 Benedikt Meurer. +# This file is distributed under the same license as the Thunar package. +# Gheyret T.Kenji ghey...@gmail.com, 2010. +# msgid msgstr Project-Id-Version: \n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: \n Last-Translator: Gheyret T.Kenji ghey...@gmail.com\n Language-Team: Uyghur Computer Science Association u...@yahoogroups.com\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #. vim: set ai et tabstop=4: #: ../panel-plugin/places.desktop.in.h:1 ../panel-plugin/cfg.c:102 @@ -201,25 +201,24 @@ msgstr بۇ يەردە تېرمىنالنى ئاچ #: ../panel-plugin/xfce4-popup-places.sh:28 msgid Usage: -msgstr +msgstr ئىشلىتىش ئۇسۇلى: #: ../panel-plugin/xfce4-popup-places.sh:29 msgid OPTION -msgstr +msgstr تاللانما #: ../panel-plugin/xfce4-popup-places.sh:31 msgid Options: -msgstr +msgstr تاللانمىلار: #: ../panel-plugin/xfce4-popup-places.sh:32 msgid Popup menu at current mouse position -msgstr +msgstr نۆۋەتتىكى چاشقىنەك ئورنىدا تىزىملىكنى سەكرەتسۇن #: ../panel-plugin/xfce4-popup-places.sh:33 -#, fuzzy msgid Show help options -msgstr تازىلاش تاللانمىسىنى كۆرسەت(_E) +msgstr ياردەم تاللانمىلىرىنى كۆرسىتىدۇ #: ../panel-plugin/xfce4-popup-places.sh:34 msgid Print version information and exit -msgstr +msgstr نەشر ئۇچۇرىنى كۆرسىتىپ ئاخىرلاشتۇرىدۇ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
