[Xfce4-commits] Bind skip-action option on the correct radio button (setting was reversed)
Updating branch refs/heads/master to f08dcadb8406f6a2094b5ae9577e340f0fb3f380 (commit) from c3a8627cc04b75b81f68e13176480183ed483715 (commit) commit f08dcadb8406f6a2094b5ae9577e340f0fb3f380 Author: Mike Massonnet Date: Wed Feb 5 20:48:59 2014 +0100 Bind skip-action option on the correct radio button (setting was reversed) panel-plugin/xfce4-clipman-settings.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel-plugin/xfce4-clipman-settings.c b/panel-plugin/xfce4-clipman-settings.c index f7bb199..37cd219 100644 --- a/panel-plugin/xfce4-clipman-settings.c +++ b/panel-plugin/xfce4-clipman-settings.c @@ -185,7 +185,7 @@ prop_dialog_run (void) xfconf_g_property_bind (xfconf_channel, "/settings/enable-actions", G_TYPE_BOOLEAN, gtk_builder_get_object (builder, "skip-action-2"), "sensitive"); xfconf_g_property_bind (xfconf_channel, "/tweaks/skip-action-on-key-down", G_TYPE_BOOLEAN, - gtk_builder_get_object (builder, "skip-action-1"), "active"); + gtk_builder_get_object (builder, "skip-action-2"), "active"); /* Tweaks tab: paste-on-activate combobox */ combobox = GTK_WIDGET (gtk_builder_get_object (builder, "combobox-paste-on-activate")); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set empty text on the clipboard when clearing history
Updating branch refs/heads/master to c3a8627cc04b75b81f68e13176480183ed483715 (commit) from c6625faef9122e9a4567eba5346949ba038c7ffe (commit) commit c3a8627cc04b75b81f68e13176480183ed483715 Author: Mike Massonnet Date: Wed Feb 5 20:25:46 2014 +0100 Set empty text on the clipboard when clearing history Call gtk_clipboard_text with an empty string before calling gtk_clipboard_clear. gtk_clipboard_clear must only be called after owning the clipboard. panel-plugin/menu.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c index a1af28b..64405da 100644 --- a/panel-plugin/menu.c +++ b/panel-plugin/menu.c @@ -261,9 +261,11 @@ cb_clear_history (ClipmanMenu *menu) clipman_history_clear (menu->priv->history); clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text (clipboard, "", 1); gtk_clipboard_clear (clipboard); clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text (clipboard, "", 1); gtk_clipboard_clear (clipboard); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove doc submodule
Updating branch refs/heads/master to 47263528ba69f5b9758ab87d58be1998132144b9 (commit) from 139d277dcc1eeb6c35643e074ddfe07d0d6055cc (commit) commit 47263528ba69f5b9758ab87d58be1998132144b9 Author: Mike Massonnet Date: Sun Feb 2 22:05:53 2014 +0100 remove doc submodule documentation is available online at http://docs.xfce.org/panel-plugins/clipman/start Makefile.am |5 - autogen.sh |1 - configure.ac.in | 36 doc |1 - 4 files changed, 43 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1d82c6b..618524b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,16 +6,11 @@ SUBDIRS = \ panel-plugin\ tests \ po \ - doc \ $(NULL) distclean-local: rm -rf *.cache *~ -DISTCHECK_CONFIGURE_FLAGS =\ - --enable-gen-doc\ - $(NULL) - EXTRA_DIST = \ AUTHORS \ ChangeLog \ diff --git a/autogen.sh b/autogen.sh index 76fba59..cb7e1a0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -11,5 +11,4 @@ EOF } XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \ -XDT_AUTOGEN_CHECK_DOCS="doc" \ exec xdt-autogen $@ diff --git a/configure.ac.in b/configure.ac.in index 98159ec..932a839 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -91,35 +91,6 @@ else enable_qrencode=no fi -dnl *** -dnl *** Check for documentation *** -dnl *** -AC_ARG_ENABLE([gen-doc], [AC_HELP_STRING([--enable-gen-doc], - [Generate HTML documentation (requires gnome-doc-utils) [default=no]])],, - [enable_gen_doc=no]) -if test x"$enable_gen_doc" = x"yes"; then - XDT_CHECK_PACKAGE([GNOME_DOC_UTILS], [gnome-doc-utils], [0.19.2], - [ -AC_PATH_PROG([ITSTOOL], [itstool], [no]) -if test x"$ITSTOOL" = x"no"; then -enable_gen_doc=no -fi - -AC_PATH_PROG([GNOME_DOC_TOOL], [gnome-doc-tool], [no]) -if test x"$GNOME_DOC_TOOL" = x"no"; then -enable_gen_doc=no -fi - ], - [ -enable_gen_doc=no - ]) - - if test x"$enable_gen_doc" = x"no"; then -AC_MSG_ERROR([Compiling with --enable-gen-doc but no suitable gnome-doc-utils and/or itstool found.]) - fi -fi -AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"]) - dnl ** dnl *** Check for i18n support *** dnl ** @@ -145,9 +116,6 @@ x11-clipboard-manager/Makefile panel-plugin/Makefile tests/Makefile po/Makefile.in -doc/Makefile -doc/media/Makefile -doc/po/Makefile ]) dnl *** @@ -160,7 +128,3 @@ echo "* Debug Support:$enable_debug" echo "* Unique: $enable_unique" echo "* QR Code: $enable_qrencode" echo -if test "x$USE_MAINTAINER_MODE" = "xyes" ; then -echo "Enable Documentation: $enable_gen_doc" -echo -fi diff --git a/doc b/doc deleted file mode 16 index cf87175..000 --- a/doc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf87175977008f876cea8a1bd0b2b503045d3213 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] === Release 1.2.4 ===
Updating branch refs/heads/master to 130aa64bcd3e175f9ba8dbc031a75d7f60626b2d (commit) from 47263528ba69f5b9758ab87d58be1998132144b9 (commit) commit 130aa64bcd3e175f9ba8dbc031a75d7f60626b2d Author: Mike Massonnet Date: Sun Feb 2 22:01:08 2014 +0100 === Release 1.2.4 === ChangeLog | 20 NEWS|8 README |1 + configure.ac.in |2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 135f3a4..be10957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2014-02-02 Mike Massonnet +=== Release 1.2.4 === + +2014-02-02 Mike Massonnet +Remove doc submodule + +2014-02-02 Mike Massonnet +Bug #10667: define different menmonic + +2014-02-02 Christian Hesse +Bug #9528: QR-code encoder + +Optional build, requires libqrencode >= 3.3. + +2014-02-01 Mike Massonnet +Bug #9896: move Disable item inside context/right-click menu + +2014-02-01 Mike Massonnet +Bug #10506: allow skipping actions by pressing or not CTRL + 2012-04-09 Mike Massonnet === Release 1.2.3 === diff --git a/NEWS b/NEWS index f0d377e..d20b5cb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Version 1.2.4 - 2014-02-02 + +- Removed doc submodule +- Bug 10667: Define different menmonic +- Bug 9528: QR-code encoder +- Bug 9896: Move Disable item inside context/right-click menu +- Bug 10506: Allow skipping actions by pressing or not CTRL + Version 1.2.3 - 2012-04-09 - Use new online documentation location http://docs.xfce.org/ diff --git a/README b/README index 9673151..d491b95 100644 --- a/README +++ b/README @@ -29,6 +29,7 @@ http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin/ Optional * unique-1.0 1.0 +* libqrencode3 3.3 Install - diff --git a/configure.ac.in b/configure.ac.in index 932a839..777aa5b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ m4_define([project_version_major], [1]) m4_define([project_version_minor], [2]) m4_define([project_version_micro], [4]) m4_define([project_version_build], [@REVISION@]) -m4_define([project_version_tag], [git]) # leave empty for release +m4_define([project_version_tag], []) # leave empty for release m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()ifelse(project_version_tag(), [git], [project_version_tag()-project_version_build()], [project_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] i18n: define different menmonic (bug 10667)
Updating branch refs/heads/master to 139d277dcc1eeb6c35643e074ddfe07d0d6055cc (commit) from 02487597b57159dc63a8bafb4ca2c7fb8a605491 (commit) commit 139d277dcc1eeb6c35643e074ddfe07d0d6055cc Author: Mike Massonnet Date: Sun Feb 2 21:43:17 2014 +0100 i18n: define different menmonic (bug 10667) panel-plugin/settings-dialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui index a369607..ee392e4 100644 --- a/panel-plugin/settings-dialog.ui +++ b/panel-plugin/settings-dialog.ui @@ -492,7 +492,7 @@ -_Skip actions by holding Control +S_kip actions by holding Control skip-action-1 True True ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] post commit fix
Updating branch refs/heads/master
to 02487597b57159dc63a8bafb4ca2c7fb8a605491 (commit)
from 4218a5125dc45e5df27b37ce5684317a738c464a (commit)
commit 02487597b57159dc63a8bafb4ca2c7fb8a605491
Author: Mike Massonnet
Date: Sun Feb 2 21:38:31 2014 +0100
post commit fix
panel-plugin/main-panel-plugin.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index d91cbd6..1279447 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -63,6 +63,7 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin)
{
MyPlugin *plugin = plugin_register ();
GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
+ GtkWidget *mi = NULL;
/* Menu Position Func */
plugin->menu_position_func = (GtkMenuPositionFunc)my_plugin_position_menu;
@@ -96,7 +97,7 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin)
xfce_panel_plugin_menu_show_about (panel_plugin);
xfce_panel_plugin_menu_show_configure (panel_plugin);
mi = gtk_check_menu_item_new_with_mnemonic (_("_Disable"));
- xfce_panel_plugin_menu_insert_item (panel_plugin, mi);
+ xfce_panel_plugin_menu_insert_item (panel_plugin, GTK_MENU_ITEM (mi));
xfconf_g_property_bind (plugin->channel, "/tweaks/inhibit",
G_TYPE_BOOLEAN, mi, "active");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] QR-code encoder (bug 9528)
+ for (k = 0; k < channels; k++)
+ pixel[i * rowstride + j * channels + k] =
!(*data & 0x1) * 0xff;
+ data++;
+ }
+
+ pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, (qrcode->width + 2) *
3, (qrcode->width + 2) * 3, GDK_INTERP_NEAREST);
+
+ QRcode_free(qrcode);
+ g_object_unref(pixbuf);
+
+ return pixbuf_scaled;
+}
+#endif
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 5f68fcf..81f37f6 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -113,6 +113,10 @@ plugin_register (void)
/* ClipmanMenu */
plugin->menu = clipman_menu_new ();
+#ifdef HAVE_QRENCODE
+ xfconf_g_property_bind (plugin->channel, "/settings/show-qr-code",
+ G_TYPE_BOOLEAN, plugin->menu, "show-qr-code");
+#endif
xfconf_g_property_bind (plugin->channel, "/tweaks/reverse-menu-order",
G_TYPE_BOOLEAN, plugin->menu, "reverse-order");
xfconf_g_property_bind (plugin->channel, "/tweaks/paste-on-activate",
@@ -321,6 +325,7 @@ plugin_about (MyPlugin *plugin)
"",
_("Contributors:"),
"(c) 2008-2009 David Collins",
+"(c) 2013 Christian Hesse",
NULL, };
const gchar *documenters[] = { "Mike Massonnet", NULL, };
const gchar *license =
diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui
index 7e4c6f1..a369607 100644
--- a/panel-plugin/settings-dialog.ui
+++ b/panel-plugin/settings-dialog.ui
@@ -70,6 +70,21 @@
0
+
+
+Show
_QR-Code
+True
+True
+False
+True
+If checked, the menu shows a QR-Code of the corrently
selected clipboard entry
+True
+True
+
+
+1
+
+
diff --git a/panel-plugin/xfce4-clipman-settings.c
b/panel-plugin/xfce4-clipman-settings.c
index 6e87798..f7bb199 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -87,6 +87,12 @@ prop_dialog_run (void)
/* General settings */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "add-selections")),
DEFAULT_ADD_PRIMARY_CLIPBOARD);
+#ifdef HAVE_QRENCODE
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "show-qr-code")),
+DEFAULT_SHOW_QR_CODE);
+#else
+ gtk_widget_hide(GTK_WIDGET (gtk_builder_get_object (builder,
"show-qr-code")));
+#endif
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "history-ignore-selections")),
DEFAULT_HISTORY_IGNORE_PRIMARY_CLIPBOARD);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "save-on-quit")),
@@ -98,6 +104,10 @@ prop_dialog_run (void)
xfconf_g_property_bind (xfconf_channel, "/settings/add-primary-clipboard",
G_TYPE_BOOLEAN,
gtk_builder_get_object (builder, "add-selections"),
"active");
+#ifdef HAVE_QRENCODE
+ xfconf_g_property_bind (xfconf_channel, "/settings/show-qr-code",
G_TYPE_BOOLEAN,
+ gtk_builder_get_object (builder, "show-qr-code"),
"active");
+#endif
xfconf_g_property_bind (xfconf_channel,
"/settings/history-ignore-primary-clipboard", G_TYPE_BOOLEAN,
gtk_builder_get_object (builder,
"history-ignore-selections"), "active");
xfconf_g_property_bind (xfconf_channel, "/settings/save-on-quit",
G_TYPE_BOOLEAN,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] build: use AC_CONFIG_HEADERS instead of obsolete AM_CONFIG_HEADER (bug 9749)
Updating branch refs/heads/master to a5f5e091ab58eb639d321ebcd69a75079c1d1122 (commit) from 59d1ae6bdd7032b66919ff24a98dd33ad58897f1 (commit) commit a5f5e091ab58eb639d321ebcd69a75079c1d1122 Author: Mike Massonnet Date: Sun Feb 2 16:12:03 2014 +0100 build: use AC_CONFIG_HEADERS instead of obsolete AM_CONFIG_HEADER (bug 9749) configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 550d654..f73924a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -23,6 +23,7 @@ AC_COPYRIGHT([Copyright (c) 2005-2012 The Xfce development team. All rights reserved.]) AC_INIT([Clipman], [project_version], [http://bugzilla.xfce.org/], [xfce4-clipman-plugin], [http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin]) +AC_CONFIG_HEADERS([config.h]) AC_PREREQ([2.50]) AC_CANONICAL_TARGET() AC_REVISION([project_version_build]) @@ -31,7 +32,6 @@ dnl *** dnl *** Initialize automake *** dnl *** AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2]) -AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] menu: move Disable item inside context/right-cli menu (bug 9896)
Updating branch refs/heads/master
to 59d1ae6bdd7032b66919ff24a98dd33ad58897f1 (commit)
from 547218e1f5710465d6fdb761c8d7cb96a81c9558 (commit)
commit 59d1ae6bdd7032b66919ff24a98dd33ad58897f1
Author: Mike Massonnet
Date: Sun Feb 2 16:02:53 2014 +0100
menu: move Disable item inside context/right-cli menu (bug 9896)
panel-plugin/main-panel-plugin.c | 10 --
panel-plugin/main-status-icon.c |4
panel-plugin/menu.c | 30 --
panel-plugin/plugin.c|2 --
4 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index e2af4d7..d91cbd6 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -92,11 +92,17 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin)
g_signal_connect (plugin->button, "button-press-event",
G_CALLBACK (cb_button_pressed), plugin);
- /* Signals */
+ /* Context menu */
xfce_panel_plugin_menu_show_about (panel_plugin);
+ xfce_panel_plugin_menu_show_configure (panel_plugin);
+ mi = gtk_check_menu_item_new_with_mnemonic (_("_Disable"));
+ xfce_panel_plugin_menu_insert_item (panel_plugin, mi);
+ xfconf_g_property_bind (plugin->channel, "/tweaks/inhibit",
+ G_TYPE_BOOLEAN, mi, "active");
+
+ /* Signals */
g_signal_connect_swapped (panel_plugin, "about",
G_CALLBACK (plugin_about), plugin);
- xfce_panel_plugin_menu_show_configure (panel_plugin);
g_signal_connect_swapped (panel_plugin, "configure-plugin",
G_CALLBACK (plugin_configure), plugin);
g_signal_connect_swapped (panel_plugin, "save",
diff --git a/panel-plugin/main-status-icon.c b/panel-plugin/main-status-icon.c
index b3dcee2..c88d7bc 100644
--- a/panel-plugin/main-status-icon.c
+++ b/panel-plugin/main-status-icon.c
@@ -133,6 +133,10 @@ cb_status_icon_popup_menu (MyPlugin *plugin, guint button,
guint activate_time)
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (plugin->popup_menu), mi);
g_signal_connect_swapped (mi, "activate", G_CALLBACK (plugin_configure),
plugin);
+ mi = gtk_check_menu_item_new_with_mnemonic (_("_Disable"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (plugin->popup_menu), mi);
+ xfconf_g_property_bind (plugin->channel, "/tweaks/inhibit",
+ G_TYPE_BOOLEAN, mi, "active");
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (plugin->popup_menu), mi);
g_signal_connect_swapped (mi, "activate", G_CALLBACK (plugin_about),
plugin);
diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c
index 41a4f1a..bf4ae9e 100644
--- a/panel-plugin/menu.c
+++ b/panel-plugin/menu.c
@@ -44,7 +44,6 @@ G_DEFINE_TYPE (ClipmanMenu, clipman_menu, GTK_TYPE_MENU)
struct _ClipmanMenuPrivate
{
- GtkWidget*mi_inhibit;
GtkWidget*mi_clear_history;
ClipmanHistory *history;
GSList *list;
@@ -56,7 +55,6 @@ struct _ClipmanMenuPrivate
enum
{
REVERSE_ORDER = 1,
- INHIBIT_MENU_ITEM,
PASTE_ON_ACTIVATE,
NEVER_CONFIRM_HISTORY_CLEAR,
};
@@ -84,7 +82,6 @@ static void_clipman_menu_free_list
(ClipmanMenu *menu);
static void cb_set_clipboard(GtkMenuItem *mi,
const
ClipmanHistoryItem *item);
static void cb_clear_history(ClipmanMenu *menu);
-static void cb_toggle_inhibit_mi(ClipmanMenu *menu);
@@ -230,13 +227,6 @@ cb_clear_history (ClipmanMenu *menu)
gtk_clipboard_clear (clipboard);
}
-static void
-cb_toggle_inhibit_mi (ClipmanMenu *menu)
-{
- gboolean toggle_value = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM
(menu->priv->mi_inhibit));
- g_object_set (menu, "inhibit-menu-item", toggle_value, NULL);
-}
-
/*
* Private methods
*/
@@ -357,13 +347,6 @@ clipman_menu_class_init (ClipmanMenuClass *klass)
FALSE,
G_PARAM_CONSTRUCT|G_PARAM_READWRITE));
- g_object_class_install_property (object_class, INHIBIT_MENU_ITEM,
- g_param_spec_boolean ("inhibit-menu-item",
- "InhibitMenuItem",
- "Toggle the inhibit
menu item to TRUE or FALSE",
- FALSE,
-
[Xfce4-commits] actions: allow skipping actions by pressing or not CTRL (bug 10506)
Updating branch refs/heads/master
to 547218e1f5710465d6fdb761c8d7cb96a81c9558 (commit)
from ce9057f5df0a9ea2ff731486a20e66632f0b2b35 (commit)
commit 547218e1f5710465d6fdb761c8d7cb96a81c9558
Author: Mike Massonnet
Date: Sat Feb 1 16:55:16 2014 +0100
actions: allow skipping actions by pressing or not CTRL (bug 10506)
panel-plugin/actions.c| 10 --
panel-plugin/settings-dialog.ui | 21 +++--
panel-plugin/xfce4-clipman-settings.c | 14 ++
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index fc8254d..579a020 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -688,10 +688,16 @@ clipman_actions_match_with_menu (ClipmanActions *actions,
GSList *l, *entries;
GdkModifierType state;
- if (actions->priv->skip_action_on_key_down && group ==
ACTION_GROUP_SELECTION)
+ if (group == ACTION_GROUP_SELECTION)
{
+ gint ctrl_mask = 0;
gdk_window_get_pointer (NULL, NULL, NULL, &state);
- if (state & GDK_CONTROL_MASK)
+ ctrl_mask = state & GDK_CONTROL_MASK;
+ if (ctrl_mask && actions->priv->skip_action_on_key_down)
+{
+ return;
+}
+ else if (!ctrl_mask && !actions->priv->skip_action_on_key_down)
{
return;
}
diff --git a/panel-plugin/settings-dialog.ui b/panel-plugin/settings-dialog.ui
index 946193c..7e4c6f1 100644
--- a/panel-plugin/settings-dialog.ui
+++ b/panel-plugin/settings-dialog.ui
@@ -460,8 +460,25 @@
-
+
+_Show actions by
holding Control
+True
+True
+False
+When the
selection is done (mouse or keyboard) and the Control key is still pressed
down, the popup menu for matched actions will be shown
+True
+True
+
+
+False
+False
+4
+
+
+
+
_Skip actions by
holding Control
+skip-action-1
True
True
False
@@ -472,7 +489,7 @@
False
False
-4
+5
diff --git a/panel-plugin/xfce4-clipman-settings.c
b/panel-plugin/xfce4-clipman-settings.c
index 38e38be..6e87798 100644
--- a/panel-plugin/xfce4-clipman-settings.c
+++ b/panel-plugin/xfce4-clipman-settings.c
@@ -155,10 +155,14 @@ prop_dialog_run (void)
DEFAULT_REORDER_ITEMS);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "reverse-order")),
DEFAULT_REVERSE_ORDER);
- gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
"skip-action")),
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
"skip-action-1")),
DEFAULT_ENABLE_ACTIONS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "skip-action")),
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
"skip-action-2")),
+DEFAULT_ENABLE_ACTIONS);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "skip-action-1")),
DEFAULT_SKIP_ACTION_ON_KEY_DOWN);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(builder, "skip-action-2")),
+!DEFAULT_SKIP_ACTION_ON_KEY_DOWN);
xfconf_g_property_bind (xfconf_channel, "/tweaks/popup-at-pointer",
G_TYPE_BOOLEAN,
gtk_builder_get_object (builder,
"popup-at-pointer"), "active");
@@ -167,9 +171,11 @@ prop_dialog_run (void)
xfconf_g_property_bind (xfconf_channel, "/tweaks/reverse-menu-order",
G_TYPE_BOOLEAN,
gtk_builder_get_object (builder, "reverse-order"),
"active");
xfconf_g_property_bind (xfconf_channel, "/settings/enable-actions",
G_TYPE_BOOLEAN,
- gtk_builder_get_object (builder, "skip-action"),
"sensitive");
+ gtk_builder_get_object (builder, "skip-action-1"),
"sensitive");
+ xfconf_g_property_bind (xfconf_channel, "/settings/enable-actions",
G_TYPE_BOOLEAN,
+ gtk_builder_get_object (builder, "skip-action-2"),
&
[Xfce4-commits] fr translation: review part #3
Updating branch refs/heads/master to 655fc7cbe75ad470adc6c29d29ac76de1bbdecb2 (commit) from d25d2f00f78e5c8cb72905eb72c65b47ae4e9028 (commit) commit 655fc7cbe75ad470adc6c29d29ac76de1bbdecb2 Author: Mike Massonnet Date: Sun Aug 18 19:52:40 2013 +0200 fr translation: review part #3 lib/po/fr.po | 159 +- 1 file changed, 114 insertions(+), 45 deletions(-) diff --git a/lib/po/fr.po b/lib/po/fr.po index c8da250..319fd94 100644 --- a/lib/po/fr.po +++ b/lib/po/fr.po @@ -6,12 +6,14 @@ # jc1 , 2013 # jc , 2013 # Jean-Philippe Fleury , 2011 +# louis94 , 2013 +# Mike Massonnet , 2013 msgid "" msgstr "" "Project-Id-Version: Xfce Websites\n" "Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n"; "POT-Creation-Date: 2013-07-03 22:08+0200\n" -"PO-Revision-Date: 2013-07-06 20:49+\n" +"PO-Revision-Date: 2013-08-18 19:49+\n" "Last-Translator: jc1 \n" "Language-Team: French (http://www.transifex.com/projects/p/xfce/language/fr/)\n" "MIME-Version: 1.0\n" @@ -46,7 +48,16 @@ msgid "" "from all around the globe. There are many different ways you can become part" " of this, just read on and pick an area which interests you or seems " "challenging." -msgstr "Bienvenue dans la communauté Xfce. En rejoignant notre équipe, vous ferez partie d'un effort international par des centaines de personnes qui travaillent pour offrir une expérience informatique du logiciel libre superbe. Vous allez rencontrer de nouveaux amis, apprendre de nouvelles compétences et de faire une différence pour des millions d'utilisateurs tout en travaillant avec des gens de partout dans le monde. Il y a beaucoup de façons différentes où vous pouvez faire partie de cela, Il suffit de lire et de choisir un domaine qui vous intéresse ou semble stimulant." +msgstr "" +"Bienvenue dans la communauté Xfce. En rejoignant notre équipe, vous ferez " +"partie d'un effort international par des centaines de personnes qui " +"partie d'un effort international de centaines de personnes qui travaillent " +"pour offrir une superbe expérience informatique du logiciel libre. Vous " +"allez rencontrer de nouveaux amis, apprendre de nouvelles compétences et de " +"faire une différence pour des millions d'utilisateurs, tout en travaillant " +"avec des gens de partout dans le monde. Il y a beaucoup de façons " +"différentes pour ce faire, Il suffit de lire et de choisir un domaine qui " +"vous intéresse ou semble stimulant." #: getinvolved/index.php:9 msgid "" @@ -54,7 +65,12 @@ msgid "" "artwork, documentation or translations; or spreading the word and helping " "out with promotion and marketing both on line and at tradeshows and " "conferences." -msgstr "Tâches possibles comprennent des tests, rapports de bogues, écriture de code, développement œuvres d'art, documentation ou traductions, ou prêcher la bonne parole et aider pour la promotion et le marketing à la fois en ligne et à des salons commerciaux et des conférences." +msgstr "" +"Les tâches possibles comprennent les tests, les rapports de bogues, " +"l'écriture de code, la création artistique, icône, fond d’écran, thèmes, la " +"documentation ou les traductions, ou encore prêcher la bonne parole et aider " +"pour la promotion et le marketing à la fois en ligne et à des salons " +"commerciaux et des conférences." #: getinvolved/index.php:12 msgid "Documentation" @@ -65,7 +81,11 @@ msgid "" "There's lots of people using and testing Xfce. By providing useful and up-" "to-date documentation, you will make a big impact on helping people " "understand how to make the most of the Xfce Desktop Environment." -msgstr "Il ya beaucoup de gens qui utilisent et tester Xfce. En fournissant de la documentation utile et à jour, vous aurez un grand impact pour l'aide des personns à comprendre comment tirer le meilleur parti de l'environnement de bureau Xfce." +msgstr "" +"Il y a beaucoup de gens qui utilisent et testent Xfce. En fournissant une " +"documentation utile et à jour, vous aurez un grand impact en aidant des " +"personnes à comprendre comment tirer le meilleur de l'environnement de " +"bureau Xfce." #: getinvolved/index.php:18 getinvolved/nav.php:7 #: getinvolved/translation.php:3 @@ -90,7 +110,7 @@ msgid "" "challenging and fun experience. You'll learn to be a better coder, you will " "get to implement new features and defeat daunting bu
[Xfce4-commits] Creating annotated tag xfce4-vala-4.10.3
Updating annotated tag refs/tags/xfce4-vala-4.10.3 as new annotated tag to e314acac3690daf2a987cce7e7c5173dd7dd2c82 (tag) succeeds xfce4-vala-4.10.2-2-gf2785e3 tagged by Mike Massonnet on 2013-08-16 22:29 +0200 Mike Massonnet (1): === Release 4.10.3 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] === Release 4.10.3 ===
Updating branch refs/heads/xfce-4.10 to fd478b5d5f60902d25a1520f5f7126f540d4719d (commit) from f2785e33e6faa83035c004a0bd3923d7cc248838 (commit) commit fd478b5d5f60902d25a1520f5f7126f540d4719d Author: Mike Massonnet Date: Fri Aug 16 22:25:34 2013 +0200 === Release 4.10.3 === ChangeLog | 19 +++ NEWS|7 ++- configure.ac.in |2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b5cf8..d34de44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2013-08-16 Mike Massonnet + +=== Release 4.10.3 === + + +2013-08-16 Kalev Lember + +Make the pkgconfig file noarch + + +2013-07-23 Natanael Copa + +Add --with-vala-api option to allow packagers select vala api version + +Let packagers set what vala API version they want build the bindings, rather +than require the they use whatever the xfce4-vala maintainer's distro happens +to use. + + 2012-10-23 Mike Massonnet === Release 4.10.2 === diff --git a/NEWS b/NEWS index c167c06..6175a90 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,9 @@ -+ Version 4.10.1, 2012-10-23 ++ Version 4.10.3, 2013-08-16 + +Make the pkgconfig file noarch. +Add --with-vala-api option to allow packagers select vala api version. + ++ Version 4.10.2, 2012-10-23 Add missing file in installation. diff --git a/configure.ac.in b/configure.ac.in index 21a74bf..17b6f8e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ dnl dnl Version information m4_define([project_version_major], [4]) m4_define([project_version_minor], [10]) -m4_define([project_version_micro], [2]) +m4_define([project_version_micro], [3]) m4_define([project_version_build], [@REVISION@]) m4_define([project_version_tag], []) # leave empty for release m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()project_version_tag()]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add --with-vala-api option to allow packagers select vala api version
Updating branch refs/heads/xfce-4.10
to ddfb8e6db5666719321dd86272d906114eda62cd (commit)
from 1be1ba42562b04310f8502ac75f2ce13aaed4d94 (commit)
commit ddfb8e6db5666719321dd86272d906114eda62cd
Author: Natanael Copa
Date: Tue Jul 23 11:57:22 2013 +0200
Add --with-vala-api option to allow packagers select vala api version
Let packagers set what vala API version they want build the bindings,
rather than require the they use whatever the xfce4-vala maintainer's
distro happens to use.
acinclude.m4| 18 +-
configure.ac.in |9 +++--
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index b47cb49..fc456cf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 >= $3], [],
dnl # M8T_CHECK_VALA(minimum_version)
dnl #
-dnl # Check for the package vala-0.16 and substitutes useful Vala variables.
+dnl # Check for the package libvala and substitutes useful Vala variables.
dnl #
AC_DEFUN([M8T_CHECK_VALA],
[
-PKG_CHECK_MODULES([VALA], [libvala-0.16 >= $1])
-M8T_VALA_PROGS()
-M8T_VAPI_DIR()
+PKG_CHECK_MODULES([VALA], [libvala-$1])
+M8T_VALA_PROGS([$1])
+M8T_VAPI_DIR([$1])
])
dnl # M8T_VALA_PROGS()
dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.16 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from libvala pkgconfig file.
dnl #
AC_DEFUN([M8T_VALA_PROGS],
[
AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.16`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-$1`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-$1`)
])
dnl # M8T_VAPI_DIR()
dnl #
-dnl # Substitutes vapidir from vala-0.16 pkgconfig file.
+dnl # Substitutes vapidir from libvala pkgconfig file.
dnl #
AC_DEFUN([M8T_VAPI_DIR],
[
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.16`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-$1`)
])
diff --git a/configure.ac.in b/configure.ac.in
index 8e7beb4..21a74bf 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,14 +29,19 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0],
[4.10.0])
M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.16.0])
+AC_ARG_WITH([vala-api],
+ AC_HELP_STRING([--with-vala-api=VERSION],
+ [Use Vala API version VERSION]),
+ [vala_api=$withval],
+ [vala_api='0.16'])
+M8T_CHECK_VALA([$vala_api])
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
[],
[with_default_vapidir=no])
if test x"$with_default_vapidir" == xno ; then
- AC_SUBST([vapidir], [${datarootdir}/vala-0.16/vapi])
+ AC_SUBST([vapidir], [${datarootdir}/vala-${vala_api}/vapi])
fi
dnl Makefile outputs
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make the pkgconfig file noarch
Updating branch refs/heads/master to 67d930b9ef4b8e35dfce46b992585376a467a46b (commit) from 6d0ef92197b94c1b1722b02e5f730e6af80ded6f (commit) commit 67d930b9ef4b8e35dfce46b992585376a467a46b Author: Kalev Lember Date: Fri Aug 16 17:14:14 2013 +0200 Make the pkgconfig file noarch Remove unused libdir definition and install it in $datadir/pkgconfig/. Makefile.am |2 +- xfce4-vala.pc.in |3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 794013b..7d931e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ vapi_DATA = \ vapi/$(EXO).deps\ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = xfce4-vala.pc EXTRA_DIST = \ diff --git a/xfce4-vala.pc.in b/xfce4-vala.pc.in index f502a84..239363c 100644 --- a/xfce4-vala.pc.in +++ b/xfce4-vala.pc.in @@ -1,7 +1,4 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ Name: @PACKAGE_TARNAME@ Description: Vala bindings for the Xfce Desktop Environment ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make the pkgconfig file noarch
Updating branch refs/heads/xfce-4.10 to f2785e33e6faa83035c004a0bd3923d7cc248838 (commit) from ddfb8e6db5666719321dd86272d906114eda62cd (commit) commit f2785e33e6faa83035c004a0bd3923d7cc248838 Author: Kalev Lember Date: Fri Aug 16 17:14:14 2013 +0200 Make the pkgconfig file noarch Remove unused libdir definition and install it in $datadir/pkgconfig/. Makefile.am |2 +- xfce4-vala.pc.in |3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 794013b..7d931e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ vapi_DATA = \ vapi/$(EXO).deps\ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = xfce4-vala.pc EXTRA_DIST = \ diff --git a/xfce4-vala.pc.in b/xfce4-vala.pc.in index f502a84..239363c 100644 --- a/xfce4-vala.pc.in +++ b/xfce4-vala.pc.in @@ -1,7 +1,4 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ Name: @PACKAGE_TARNAME@ Description: Vala bindings for the Xfce Desktop Environment ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] fr translation: fix some tags...
Updating branch refs/heads/master to 75c8614cfdd830a189765d14fd0e4ff00113ac71 (commit) from cdd2ce6ffdc7c654b33d0ca90b30e2ff569ae49e (commit) commit 75c8614cfdd830a189765d14fd0e4ff00113ac71 Author: Mike Massonnet Date: Sun Aug 11 19:08:32 2013 +0200 fr translation: fix some tags... lib/po/fr.po | 52 ++-- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/po/fr.po b/lib/po/fr.po index f92f210..0caaff9 100644 --- a/lib/po/fr.po +++ b/lib/po/fr.po @@ -103,7 +103,7 @@ msgid "" " account you can also help by reposting any http://identi.ca/xfce\";>announcements we make to help us reach a " "larger audience." -msgstr "Si vous possédez un blog ou site web vous pouvez grandement aider en diffusant le mot et d'encourager de nouveaux utilisateurs à donner Xfce un essai. Si vous avez un compte Identi.ca ou Twitter, vous pouvez aussi aider en reposter une http://identi.ca/xfce\";> annonces que nous faisons pour nous aider à atteindre un public plus large." +msgstr "Si vous possédez un blog ou site web vous pouvez grandement aider en diffusant le mot et d'encourager de nouveaux utilisateurs à donner Xfce un essai. Si vous avez un compte Identi.ca ou Twitter, vous pouvez aussi aider en reposter une http://identi.ca/xfce\";>annonces que nous faisons pour nous aider à atteindre un public plus large." #: getinvolved/index.php:34 msgid "Bug Reporting and testing" @@ -172,14 +172,14 @@ msgid "" "view statistics. All translation updates are directly submitted in the http://git.xfce.org\";>Xfce GIT repositories, so they are directly" " available for the rest of the world." -msgstr "Xfce utilise la https://www.transifex.com/\";> Transifex plate-forme de traduction comme un portail pour les traducteurs. Cela permet aux traducteurs de traduire en ligne, présenter de nouveaux po les fichiers, traductions de regarder et de regarder les statistiques. Toutes les mises à jour de traduction sont directement soumis aux http://git.xfce.org\";> Xfce dépôts Git , ils sont donc directement disponibles pour le reste du monde." +msgstr "Xfce utilise la https://www.transifex.com/\";>Transifex plate-forme de traduction comme un portail pour les traducteurs. Cela permet aux traducteurs de traduire en ligne, présenter de nouveaux po les fichiers, traductions de regarder et de regarder les statistiques. Toutes les mises à jour de traduction sont directement soumis aux http://git.xfce.org\";>Xfce dépôts Git, ils sont donc directement disponibles pour le reste du monde." #: getinvolved/translation.php:14 msgid "" "Because we'd like to translate Xfce in as much languages as possible, we are" " always looking for new translation contributors. If you're interested in " "this, read the getting started section below." -msgstr "Parce que nous aimerions traduire Xfce en autant de langues que possible, nous sommes toujours à la recherche de nouveaux contributeurs de traduction. Si vous êtes intéressé par ce sujet, consultez la section Mise en route ci-dessous." +msgstr "Parce que nous aimerions traduire Xfce en autant de langues que possible, nous sommes toujours à la recherche de nouveaux contributeurs de traduction. Si vous êtes intéressé par ce sujet, consultez la section Mise en route ci-dessous." #: getinvolved/translation.php:17 msgid "Getting Started" @@ -189,13 +189,13 @@ msgstr "Mise en route " msgid "" "Before you can contribute translations, you have to go through the steps " "below. Note that ALL these steps are required:" -msgstr "Avant de pouvoir contribuer traductions, vous devez passer par les étapes ci-dessous. Notez que ALL ces étapes sont nécessaires:" +msgstr "Avant de pouvoir contribuer aux traductions, vous devez passer par les étapes ci-dessous. Notez que TOUTES ces étapes sont nécessaires:" #: getinvolved/translation.php:24 msgid "" "First go to https://www.transifex.com/\";>transifex.com and " "create a new profile." -msgstr "D'abord aller sur https://www.transifex.com/\";> transifex.com et créer un nouveau profil." +msgstr "D'abord aller sur https://www.transifex.com/\";>transifex.com et créer un nouveau profil." #: getinvolved/translation.php:25 msgid "" @@ -204,7 +204,7 @@ msgid "" " coordinated, so it is nice to introduce yourself here. On this list " "developer will also announce when releases are planned, translations system " "changes or anything else you should know as a translators." -msgstr "Rejoigne
[Xfce4-commits] fr translation: fix caps for navigation
Updating branch refs/heads/master to cdd2ce6ffdc7c654b33d0ca90b30e2ff569ae49e (commit) from 390b3d9c2a97daeefa9542ec69ea7c51980ed554 (commit) commit cdd2ce6ffdc7c654b33d0ca90b30e2ff569ae49e Author: Mike Massonnet Date: Sun Aug 11 18:40:56 2013 +0200 fr translation: fix caps for navigation lib/po/fr.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/po/fr.po b/lib/po/fr.po index 9e88832..f92f210 100644 --- a/lib/po/fr.po +++ b/lib/po/fr.po @@ -146,7 +146,7 @@ msgstr "Traqueur de bogues" #: getinvolved/nav.php:18 community/nav.php:20 msgid "report problems, patches or ideas to help making Xfce better" -msgstr "Pour signaler un problème, patchs ou des idées pour aider à faire mieux Xfce" +msgstr "rapporter des problèmes, correctifs ou des idées pour améliorer Xfce" #: getinvolved/nav.php:22 msgid "Transifex" @@ -154,7 +154,7 @@ msgstr "Transifex" #: getinvolved/nav.php:23 msgid "the Xfce translation portal" -msgstr "Le portail de traduction de Xfce" +msgstr "portail de traduction de Xfce" #: getinvolved/nav.php:27 msgid "Buildbot" @@ -505,7 +505,7 @@ msgstr "Wiki" #: community/nav.php:15 msgid "community wiki and development resources" -msgstr "Wiki de la communauté et les ressources de développement" +msgstr "wiki de la communauté et les ressources de développement" #: 404.php:1 msgid "Page not found" @@ -3340,7 +3340,7 @@ msgstr "A côté de l'ensemble de base de modules, Xfce offre également de nomb #: about/nav.php:5 msgid "general information about the Xfce desktop" -msgstr "Informations générales sur le bureau Xfce" +msgstr "informations générales sur le bureau Xfce" #: about/nav.php:9 msgid "4.10 Tour" @@ -3368,8 +3368,8 @@ msgstr "annonces de parution" #: about/nav.php:31 msgid "list of all contributors" -msgstr "La liste des contributeurs" +msgstr "liste des contributeurs" #: about/nav.php:36 msgid "the Xfce release policy for core modules" -msgstr "La politique de parution Xfce pour les modules de base" +msgstr "politique de parution Xfce pour les modules de base" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] fr translation: s/Bug Tracker/Traqueur de bogues/
Updating branch refs/heads/master to 390b3d9c2a97daeefa9542ec69ea7c51980ed554 (commit) from 8dc3363c44c663cb18f57ee1391c9fceab207821 (commit) commit 390b3d9c2a97daeefa9542ec69ea7c51980ed554 Author: Mike Massonnet Date: Sun Aug 11 17:59:48 2013 +0200 fr translation: s/Bug Tracker/Traqueur de bogues/ lib/po/fr.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/po/fr.po b/lib/po/fr.po index cb448a3..9e88832 100644 --- a/lib/po/fr.po +++ b/lib/po/fr.po @@ -117,7 +117,7 @@ msgid "" "impossible task. As such we kindly ask users to assist in testing, and " "reporting all bugs they may find, using our https://bugzilla.xfce.org\"; class=\"external\">bug tracker." -msgstr "L'une des tâches les plus utiles que nous comptons sur la communauté de teste et de rapports de bogues. Depuis Xfce fonctionne sur diverses plates-formes et dans un grand nombre de configurations différentes, l'essai tous les changements dans toutes les situations possibles est une tâche impossible. Par conséquent, nous demandons aux utilisateurs de contribuer à l'essai, et signaler tous les bogues qu'ils peuvent trouver, en utilisant notre https://bugzilla.xfce.org\"; class=\"external\"> Bug Tracker ." +msgstr "L'une des tâches les plus utiles que nous comptons sur la communauté de teste et de rapports de bogues. Depuis Xfce fonctionne sur diverses plates-formes et dans un grand nombre de configurations différentes, l'essai tous les changements dans toutes les situations possibles est une tâche impossible. Par conséquent, nous demandons aux utilisateurs de contribuer à l'essai, et signaler tous les bogues qu'ils peuvent trouver, en utilisant notre https://bugzilla.xfce.org\"; class=\"external\">traqueur de bogues." #: getinvolved/index.php:40 msgid "" @@ -142,7 +142,7 @@ msgstr "Sites connexes" #: getinvolved/nav.php:17 community/nav.php:19 msgid "Bug Tracker" -msgstr "Bug Tracker" +msgstr "Traqueur de bogues" #: getinvolved/nav.php:18 community/nav.php:20 msgid "report problems, patches or ideas to help making Xfce better" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] fr translation: s/bug/bogue/
Updating branch refs/heads/master to 8dc3363c44c663cb18f57ee1391c9fceab207821 (commit) from 3d75eafaa326844e8e25ab93eb3e4d7ae305c07d (commit) commit 8dc3363c44c663cb18f57ee1391c9fceab207821 Author: Mike Massonnet Date: Sun Aug 11 17:57:20 2013 +0200 fr translation: s/bug/bogue/ lib/po/fr.po | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/po/fr.po b/lib/po/fr.po index dc6daa8..cb448a3 100644 --- a/lib/po/fr.po +++ b/lib/po/fr.po @@ -54,7 +54,7 @@ msgid "" "artwork, documentation or translations; or spreading the word and helping " "out with promotion and marketing both on line and at tradeshows and " "conferences." -msgstr "Tâches possibles comprennent des tests, rapports de bugs, écriture de code, développement œuvres d'art, documentation ou traductions, ou prêcher la bonne parole et aider pour la promotion et le marketing à la fois en ligne et à des salons commerciaux et des conférences." +msgstr "Tâches possibles comprennent des tests, rapports de bogues, écriture de code, développement œuvres d'art, documentation ou traductions, ou prêcher la bonne parole et aider pour la promotion et le marketing à la fois en ligne et à des salons commerciaux et des conférences." #: getinvolved/index.php:12 msgid "Documentation" @@ -90,7 +90,7 @@ msgid "" "challenging and fun experience. You'll learn to be a better coder, you will " "get to implement new features and defeat daunting bugs, creating a stunning " "product, all the while collaborating with people from all around the world." -msgstr "En devenant un développeur, vous pouvez faire une grande différence en profitant d'une expérience stimulante et amusante. Vous apprenez à être un meilleur codeur, vous aurez à mettre en œuvre de nouvelles fonctionnalités et de vaincre les bugs redoutables, la création d'un produit magnifique, tout en collaborant avec des gens de partout dans le monde." +msgstr "En devenant un développeur, vous pouvez faire une grande différence en profitant d'une expérience stimulante et amusante. Vous apprenez à être un meilleur codeur, vous aurez à mettre en œuvre de nouvelles fonctionnalités et de vaincre les bogues redoutables, la création d'un produit magnifique, tout en collaborant avec des gens de partout dans le monde." #: getinvolved/index.php:29 msgid "Promotion" @@ -107,7 +107,7 @@ msgstr "Si vous possédez un blog ou site web vous pouvez grandement aider en di #: getinvolved/index.php:34 msgid "Bug Reporting and testing" -msgstr "Rapports de bug et tests" +msgstr "Rapports de bogues et tests" #: getinvolved/index.php:36 msgid "" @@ -117,7 +117,7 @@ msgid "" "impossible task. As such we kindly ask users to assist in testing, and " "reporting all bugs they may find, using our https://bugzilla.xfce.org\"; class=\"external\">bug tracker." -msgstr "L'une des tâches les plus utiles que nous comptons sur la communauté de teste et de rapports de bugs. Depuis Xfce fonctionne sur diverses plates-formes et dans un grand nombre de configurations différentes, l'essai tous les changements dans toutes les situations possibles est une tâche impossible. Par conséquent, nous demandons aux utilisateurs de contribuer à l'essai, et signaler tous les bugs qu'ils peuvent trouver, en utilisant notre https://bugzilla.xfce.org\"; class=\"external\"> Bug Tracker ." +msgstr "L'une des tâches les plus utiles que nous comptons sur la communauté de teste et de rapports de bogues. Depuis Xfce fonctionne sur diverses plates-formes et dans un grand nombre de configurations différentes, l'essai tous les changements dans toutes les situations possibles est une tâche impossible. Par conséquent, nous demandons aux utilisateurs de contribuer à l'essai, et signaler tous les bogues qu'ils peuvent trouver, en utilisant notre https://bugzilla.xfce.org\"; class=\"external\"> Bug Tracker ." #: getinvolved/index.php:40 msgid "" @@ -125,7 +125,7 @@ msgid "" "and then (obviously) fixed. If you want to get involved in the actual " "development process of Xfce a great way to start is by solving bugs and then" " submitting a patch file." -msgstr "Une fois qu'un bug a été trouvé, la cause de l'anomalie doit être traqué, puis (évidemment) fixé. Si vous souhaitez vous impliquer dans le processus de développement réel de Xfce une excellente façon de commencer est de résoudre les bugs et puis en soumettant un fichier patch." +msgstr "Une fois qu'un bogue a été trouvé, la cause de l&#
[Xfce4-commits] Add --with-vala-api option to allow packagers select vala api version
Updating branch refs/heads/master
to 6d0ef92197b94c1b1722b02e5f730e6af80ded6f (commit)
from 440fad49c3e30edfe57f70fbe86e08e4beda5619 (commit)
commit 6d0ef92197b94c1b1722b02e5f730e6af80ded6f
Author: Natanael Copa
Date: Tue Jul 23 11:57:22 2013 +0200
Add --with-vala-api option to allow packagers select vala api version
Let packagers set what vala API version they want build the bindings,
rather than require the they use whatever the xfce4-vala maintainer's
distro happens to use.
acinclude.m4| 18 +-
configure.ac.in |9 +++--
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index b47cb49..fc456cf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 >= $3], [],
dnl # M8T_CHECK_VALA(minimum_version)
dnl #
-dnl # Check for the package vala-0.16 and substitutes useful Vala variables.
+dnl # Check for the package libvala and substitutes useful Vala variables.
dnl #
AC_DEFUN([M8T_CHECK_VALA],
[
-PKG_CHECK_MODULES([VALA], [libvala-0.16 >= $1])
-M8T_VALA_PROGS()
-M8T_VAPI_DIR()
+PKG_CHECK_MODULES([VALA], [libvala-$1])
+M8T_VALA_PROGS([$1])
+M8T_VAPI_DIR([$1])
])
dnl # M8T_VALA_PROGS()
dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.16 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from libvala pkgconfig file.
dnl #
AC_DEFUN([M8T_VALA_PROGS],
[
AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.16`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-$1`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-$1`)
])
dnl # M8T_VAPI_DIR()
dnl #
-dnl # Substitutes vapidir from vala-0.16 pkgconfig file.
+dnl # Substitutes vapidir from libvala pkgconfig file.
dnl #
AC_DEFUN([M8T_VAPI_DIR],
[
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.16`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-$1`)
])
diff --git a/configure.ac.in b/configure.ac.in
index a8241d3..c29cde0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,14 +29,19 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0],
[4.10.0])
M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.16.0])
+AC_ARG_WITH([vala-api],
+ AC_HELP_STRING([--with-vala-api=VERSION],
+ [Use Vala API version VERSION]),
+ [vala_api=$withval],
+ [vala_api='0.16'])
+M8T_CHECK_VALA([$vala_api])
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
[],
[with_default_vapidir=no])
if test x"$with_default_vapidir" == xno ; then
- AC_SUBST([vapidir], [${datarootdir}/vala-0.16/vapi])
+ AC_SUBST([vapidir], [${datarootdir}/vala-${vala_api}/vapi])
fi
dnl Makefile outputs
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] hypertextview: Use small tab stops
Updating branch refs/heads/master
to 602637ef5e1338da125fd19d52ebeab7c683c7eb (commit)
from 2169fe4b1d350bdb2954d06971ced7f934c7291a (commit)
commit 602637ef5e1338da125fd19d52ebeab7c683c7eb
Author: Mike Massonnet
Date: Tue May 21 22:53:35 2013 +0200
hypertextview: Use small tab stops
lib/hypertextview.vala |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/hypertextview.vala b/lib/hypertextview.vala
index a1f3038..ffb2c64 100644
--- a/lib/hypertextview.vala
+++ b/lib/hypertextview.vala
@@ -51,6 +51,7 @@ namespace Xnp {
construct {
this.font = "Sans 13";
+ this.tabs = new Pango.TabArray.with_positions (1, true,
Pango.TabAlign.LEFT, 12);
}
public HypertextView () {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update POTFILES
Updating branch refs/heads/master to 2169fe4b1d350bdb2954d06971ced7f934c7291a (commit) from 7a6ca567716144389ab2cdcbabca6203c1c0e707 (commit) commit 2169fe4b1d350bdb2954d06971ced7f934c7291a Author: Mike Massonnet Date: Tue May 14 15:08:59 2013 +0200 Update POTFILES po/POTFILES.in |3 +-- po/POTFILES.skip |2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 9bd20e4..abf8de5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,14 +1,13 @@ src/xfce4-notes.desktop.in src/xfce4-notes-autostart.desktop.in src/xfce4-notes-plugin.desktop.in -lib/color.c lib/popup.c lib/application.vala lib/window.vala lib/note.vala lib/hypertextview.vala src/xfce4-popup-notes.c -src/xfce4-notes-settings.c +src/main-settings-dialog.c src/main-panel-plugin.vala src/xfce-autostart.c src/main-status-icon.vala diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 2ed290a..0c3fb20 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,5 +2,7 @@ lib/application.c lib/window.c lib/note.c lib/hypertextview.c +lib/ext-gdk.c +lib/theme-gtkrc.c src/main-panel-plugin.c src/main-status-icon.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] vala: Cast Gtk.Widget to Gtk.Button
Updating branch refs/heads/master
to 7a6ca567716144389ab2cdcbabca6203c1c0e707 (commit)
from 88d9564dc846d2cea8704659028550c4ea1f56d0 (commit)
commit 7a6ca567716144389ab2cdcbabca6203c1c0e707
Author: Mike Massonnet
Date: Wed Mar 13 10:16:06 2013 +0100
vala: Cast Gtk.Widget to Gtk.Button
src/main-panel-plugin.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main-panel-plugin.vala b/src/main-panel-plugin.vala
index a4c8642..46fbbbc 100644
--- a/src/main-panel-plugin.vala
+++ b/src/main-panel-plugin.vala
@@ -36,7 +36,7 @@ public class NotesPlugin : Xfce.PanelPlugin {
Xfce.textdomain (Config.GETTEXT_PACKAGE,
Config.PACKAGE_LOCALE_DIR);
application = new Xnp.Application (save_location (true));
- button = Xfce.panel_create_button ();
+ button = (Gtk.Button)Xfce.panel_create_button ();
image = new Xfce.PanelImage.from_source ("xfce4-notes-plugin");
button.add (image);
button.clicked.connect (() => { application.show_hide_notes ();
});
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Added theming support through GtkCssProvider
Updating branch refs/heads/master
to 5e59d5eafb9e91135160fd5ecb47c5a33a136556 (commit)
from 3b5e6b2d49e34c4889a3869e4960ce76da6e8477 (commit)
commit 5e59d5eafb9e91135160fd5ecb47c5a33a136556
Author: Mike Massonnet
Date: Tue Mar 12 16:35:40 2013 +0100
gtk3: Added theming support through GtkCssProvider
Added a custom CSS file that is installed system-wide and contains
modifications on top of the Adwaita theme to look monochrome with a
customizable background color set within xfconf.
Reading the default background color from GTK+ is not supported yet.
Splitted color.c,h,vapi in two sections inside ext-gdk.c,h,vapi and
theme-gtkrc.c,h,vapi. The source theme-gtkrc is used for GTK+2 and
theme-gtkcss for GTK+3.
data/gtk-3.0/gtk-main.css | 37 +
lib/Makefile.am| 20 -
lib/application.vala |9 +-
lib/color.c| 174
lib/color.vapi |7 --
lib/ext-gdk.c | 80 ++
lib/{color.h => ext-gdk.h} | 15 +---
lib/ext-gdk.vapi |5 +
lib/theme-gtkcss.vala | 50
lib/theme-gtkrc.c | 102 +++
lib/{popup.h => theme-gtkrc.h} | 19 ++---
lib/theme-gtkrc.vapi |7 ++
lib/{popup.h => theme.vala}| 30 +---
src/Makefile.am|5 +-
src/main-settings-dialog.c |2 +-
15 files changed, 334 insertions(+), 228 deletions(-)
diff --git a/data/gtk-3.0/gtk-main.css b/data/gtk-3.0/gtk-main.css
new file mode 100644
index 000..f0be8b7
--- /dev/null
+++ b/data/gtk-3.0/gtk-main.css
@@ -0,0 +1,37 @@
+@define-color theme_base_color @notes_bg_color;
+@define-color theme_text_color shade (@theme_base_color, 0.4);
+@define-color theme_bg_color @theme_base_color;
+@define-color theme_fg_color shade (@theme_base_color, 0.3);
+@define-color theme_selected_bg_color shade (@theme_base_color, 0.8);
+@define-color theme_selected_fg_color shade (@theme_base_color, 1.4);
+@define-color insensitive_fg_color shade (@theme_fg_color, 1.8);
+@define-color insensitive_bg_color shade (@theme_bg_color, 1.1);
+
+@define-color borders shade (@theme_base_color, 0.8);
+@define-color frame_color shade (@theme_base_color, 0.8);
+@define-color notebook_active_tab_border shade (@theme_base_color, 1.1);
+@define-color notebook_selected_tab_color shade (@theme_base_color, 0.9);
+
+GtkWindow {
+ background-image: linear-gradient(to bottom,
+ shade (@theme_base_color, 0.8),
+ shade (@theme_base_color, 0.95) 87px);
+}
+
+.button {
+ background-color: transparent;
+}
+
+.button *:active {
+color: darker (@theme_fg_color);
+text-shadow: 1 1 lighter (@theme_bg_color);
+}
+
+.tooltip {
+ border-style: solid;
+ border-width: 1px;
+ border-color: lighter (@theme_fg_color);
+ color: darker (@theme_fg_color);
+ text-shadow: 1 1 lighter (@theme_bg_color);
+}
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 498ee59..118582a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,6 @@ libnotes_la_VALAFLAGS =
\
--header=libnotes.h \
--vapidir=$(srcdir) \
--pkg=config\
- --pkg=color \
--pkg=libxfconf-0 \
--pkg=libxfce4util-1.0
@@ -15,6 +14,8 @@ libnotes_la_VALAFLAGS +=
\
--pkg=gtk+-3.0
else
libnotes_la_VALAFLAGS += \
+ --pkg=ext-gdk \
+ --pkg=theme-gtkrc \
--pkg=gtk+-2.0
endif
@@ -25,11 +26,16 @@ libnotes_la_SOURCES =
\
hypertextview.vala \
note.vala \
window.vala \
- color.c
+ theme.vala
-if !ENABLE_GTK3
+if ENABLE_GTK3
libnotes_la_SOURCES += \
- popup.c
+ theme-gtkcss.vala
+else
+libnotes_la_SOURCES += \
+ popup.c \
+ ext-gdk.c \
+ theme-gtkrc.c
endif
libnotes_la_CFLAGS = \
@@ -50,13 +56,17 @@ libnotes_
[Xfce4-commits] cgit: Remove module.xml previously used on git.xfce.org
Updating branch refs/heads/master to 88d9564dc846d2cea8704659028550c4ea1f56d0 (commit) from 5e59d5eafb9e91135160fd5ecb47c5a33a136556 (commit) commit 88d9564dc846d2cea8704659028550c4ea1f56d0 Author: Mike Massonnet Date: Wed Mar 13 08:26:33 2013 +0100 cgit: Remove module.xml previously used on git.xfce.org module.xml | 13 - 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/module.xml b/module.xml deleted file mode 100644 index 76fd27e..000 --- a/module.xml +++ /dev/null @@ -1,13 +0,0 @@ - - xfce4-notes-plugin - Notes plugin for the Xfce Panel - http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"/> - http://foo-projects.org/mailman/listinfo/xfce"/> - - - Mike Massonnet - mailto:mmasson...@xfce.org - mmassonnet - - - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Smaller icon buttons to fit better in the button frame
Updating branch refs/heads/master
to 3b5e6b2d49e34c4889a3869e4960ce76da6e8477 (commit)
from 4cfd09b46a24ea468fcbe5b87c86126ef5a1ab01 (commit)
commit 3b5e6b2d49e34c4889a3869e4960ce76da6e8477
Author: Mike Massonnet
Date: Sun Mar 10 09:14:55 2013 +0100
gtk3: Smaller icon buttons to fit better in the button frame
lib/icon-button.vala | 21 +
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/icon-button.vala b/lib/icon-button.vala
index 12e0d4f..07b6b14 100644
--- a/lib/icon-button.vala
+++ b/lib/icon-button.vala
@@ -47,13 +47,6 @@ namespace Xnp {
var style_context = get_style_context ();
if (sensitive && active) {
- int width = get_allocated_width ();
- int height = get_allocated_height ();
- style_context.save ();
- style_context.add_class
(Gtk.STYLE_CLASS_BUTTON);
- style_context.render_frame (cr, 0, 0, width,
height);
- style_context.render_background (cr, 0, 0,
width, height);
- style_context.restore ();
Gdk.cairo_set_source_rgba (cr,
style_context.get_color (Gtk.StateFlags.PRELIGHT));
}
else if (sensitive && !active)
@@ -78,7 +71,19 @@ namespace Xnp {
public override bool draw (Cairo.Context cr) {
int width = get_allocated_width ();
int height = get_allocated_height ();
- draw_icon (cr, width, height);
+ var style_context = get_style_context ();
+
+ style_context.save ();
+ style_context.add_class (Gtk.STYLE_CLASS_BUTTON);
+ style_context.render_frame (cr, 0, 0, width, height);
+ style_context.render_background (cr, 0, 0, width,
height);
+ style_context.restore ();
+
+ cr.save ();
+ cr.translate (2, 2);
+ draw_icon (cr, width - 4, height - 4);
+ cr.restore ();
+
return false;
}
#else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Implement popup command with Gtk.Application
Updating branch refs/heads/master
to 4cfd09b46a24ea468fcbe5b87c86126ef5a1ab01 (commit)
from 92e14fa7ea78da2e7e5dc578dcf3741321820037 (commit)
commit 4cfd09b46a24ea468fcbe5b87c86126ef5a1ab01
Author: Mike Massonnet
Date: Sat Mar 9 21:35:02 2013 +0100
gtk3: Implement popup command with Gtk.Application
Instead of depending on oldish X11 code to show/hide the notes, use
Gtk.Application. For GTK3, the binary xfce4-popup-notes is build out of
main-popup.vala, while xfce4-popup-notes.c is kept as-is for GTK2.
Both xfce4-popup-notes and xfce4-notes binaries define a unique ID
org.xfce.Notes and send an activate signal in case a primary instance of
xfce4-notes is already running.
src/Makefile.am| 25 ---
lib/color.h => src/main-popup.vala | 45
src/main-status-icon.vala | 17 -
3 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index ad720b6..032eba4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+BUILT_SOURCES =
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
@@ -10,7 +11,25 @@ INCLUDES =
\
#
if ENABLE_GTK3
-bin_PROGRAMS =
+bin_PROGRAMS = xfce4-popup-notes
+
+if MAINTAINER_MODE
+xfce4_popup_notes_VALAFLAGS = \
+ --pkg=gtk+-3.0
+
+BUILT_SOURCES += main-popup.c
+main-popup.c: main-popup.vala
+ $(AM_V_GEN) $(VALAC) $(xfce4_popup_notes_VALAFLAGS) $< -C
+endif
+
+xfce4_popup_notes_SOURCES =\
+ main-popup.c
+
+xfce4_popup_notes_CFLAGS = \
+ @GTK_CFLAGS@
+
+xfce4_popup_notes_LDADD = \
+ @GTK_LIBS@
else
bin_PROGRAMS = xfce4-popup-notes
@@ -79,7 +98,7 @@ notes_VALAFLAGS +=
\
--pkg=gtk+-2.0
endif
-BUILT_SOURCES = main-panel-plugin.c
+BUILT_SOURCES += main-panel-plugin.c
main-panel-plugin.c: main-panel-plugin.vala
$(AM_V_GEN) $(VALAC) $(notes_VALAFLAGS) $< -C
endif
@@ -103,8 +122,6 @@ libnotes_la_LIBADD =
\
@LIBXFCE4UTIL_LIBS@ \
@XFCONF_LIBS@
-else
-BUILT_SOURCES =
endif
#
diff --git a/lib/color.h b/src/main-popup.vala
similarity index 52%
copy from lib/color.h
copy to src/main-popup.vala
index 031b5ba..e52f7ac 100644
--- a/lib/color.h
+++ b/src/main-popup.vala
@@ -1,6 +1,6 @@
/*
* Notes - panel plugin for Xfce Desktop Environment
- * Copyright (C) 2009-2010 Mike Massonnet
+ * Copyright (C) 2006-2013 Mike Massonnet
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,22 +17,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef COLOR_H
-#define COLOR_H
-
-#include
-#include
-#include
-
-voidcolor_set_background(const gchar
*background);
-void__gdk_color_contrast(GdkColor *color,
- gdouble contrast);
-#if !GTK_CHECK_VERSION (2,12,0)
-gchar * gdk_color_to_string (const GdkColor
*color);
-#endif
-#if !GTK_CHECK_VERSION (2,14,0)
-GtkWidget* gtk_color_selection_dialog_get_color_selection
(GtkColorSelectionDialog *colorsel);
-#endif
-
-#endif
-
+static int main (string[] args) {
+ Gtk.init (ref args);
+ var app = new GLib.Application ("org.xfce.Notes", 0);
+ try {
+ app.register ();
+ } catch (GLib.Error e) {
+ warning ("Unable to register: %s", e.message);
+ return -1;
+ }
+ if (!app.get_is_remote ()) {
+ // We are the primary instance, in that case start xfce4-notes
+ try {
+ message ("xfce4-notes isn't currently running, trying
to start it...");
+ GLib.Process.spawn_command_line_async ("xfce4-notes");
+ } catch (GLib.Error e) {
+ critical ("%s", e.message);
+ return -1;
+ }
+ } else {
+ // Send an activate signal which is used to show/hide the notes
+ app.activate ();
+ }
+ return 0;
+}
diff --git a/src/main-status-icon.vala b/src/main-status-icon.vala
index 6f3b247..429b6d8 100644
--- a/src/main-status-icon.vala
[Xfce4-commits] gtk3: Drop the background color setting
Updating branch refs/heads/master
to 92e14fa7ea78da2e7e5dc578dcf3741321820037 (commit)
from de7638f7600fda93f91c8608da2ba7971a2dd16c (commit)
commit 92e14fa7ea78da2e7e5dc578dcf3741321820037
Author: Mike Massonnet
Date: Sat Mar 9 10:16:51 2013 +0100
gtk3: Drop the background color setting
Theming the notes window with GTK3 will need something different than
gtkrc, and currently the background setting depends on a gtkrc file.
src/main-settings-dialog.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index 271654e..6afb515 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -58,6 +58,7 @@ enum
static GtkWidget *size_combo_box_new ();
static void cb_size_combobox_changed (GtkComboBox *combobox, gpointer data);
+#ifndef ENABLE_GTK3
enum
{
COMBOBOX_BACKGROUND_YELLOW,
@@ -83,11 +84,14 @@ static gboolean timeout_cb_background_changed (gchar
*color);
static GtkWidget *color_button_new ();
static gboolean cb_color_button_pressed (GtkButton *button, GdkEventButton
*event, gpointer data);
+#endif
static GtkWidget *parent_window = NULL;
static XfconfChannel *xfconf_channel = NULL;
+#ifndef ENABLE_GTK3
static GtkWidget *color_combobox = NULL;
static GtkWidget *color_button = NULL;
+#endif
static GtkWidget *
prop_dialog_new (void)
@@ -183,6 +187,7 @@ prop_dialog_new (void)
button = tabs_combo_box_new ();
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+#ifndef ENABLE_GTK3
/* Background color */
#ifdef ENABLE_GTK3
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
@@ -199,6 +204,7 @@ prop_dialog_new (void)
color_button = color_button_new ();
gtk_box_pack_start (GTK_BOX (hbox), color_button, FALSE, FALSE, 0);
+#endif
/* Font description */
#ifdef ENABLE_GTK3
@@ -406,6 +412,7 @@ cb_size_combobox_changed (GtkComboBox *combobox,
xfconf_channel_set_int (xfconf_channel, "/new-window/height", height);
}
+#ifndef ENABLE_GTK3
static GtkWidget *
background_combo_box_new (void)
{
@@ -655,6 +662,7 @@ cb_color_button_pressed (GtkButton *button,
return TRUE;
}
+#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] settings: Drop the notes path setting
Updating branch refs/heads/master
to de7638f7600fda93f91c8608da2ba7971a2dd16c (commit)
from 0b2d200dfe147a978e407d6a8c2d22ab6acc8156 (commit)
commit de7638f7600fda93f91c8608da2ba7971a2dd16c
Author: Mike Massonnet
Date: Sat Mar 9 08:59:17 2013 +0100
settings: Drop the notes path setting
The notes path setting is not explained, thus one has to guess what path
to choose and if set incorrectly, things might really get mixed up.
For the moment simply "hide" the code.
src/main-settings-dialog.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index 86b48a3..271654e 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -32,8 +32,10 @@
#include "defines.h"
#include "color.h"
+#if 0
static GtkWidget *notes_path_button_new ();
static void cb_notes_path_changed (GtkFileChooserButton *button, gpointer
data);
+#endif
enum
{
@@ -145,6 +147,14 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 0);
/* Notes path */
+#if 0
+/*
+ * I currently dislike this setting in the middle here, plus the
+ * setting is not easy to understand since the notes are stored
+ * within a specific structure (notes_path/GroupX/NoteY). One has
+ * to select an empty directory otherwise things might really get
+ * mixed up.
+ */
#ifdef ENABLE_GTK3
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
#else
@@ -157,6 +167,7 @@ prop_dialog_new (void)
button = notes_path_button_new (dialog);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+#endif
/* Tabs position */
#ifdef ENABLE_GTK3
@@ -249,6 +260,7 @@ prop_dialog_new (void)
return dialog;
}
+#if 0
static GtkWidget *
notes_path_button_new (void)
{
@@ -298,6 +310,7 @@ cb_notes_path_changed (GtkFileChooserButton *button,
g_object_unref (file);
g_free (notes_path);
}
+#endif
static GtkWidget *
tabs_combo_box_new (void)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Make settings dialog build with GTK3
Updating branch refs/heads/master
to 9090edbbae064d924b9185f551aba50aa1708585 (commit)
from 87856fa93f8e652e3d4d0554858f538f687312ac (commit)
commit 9090edbbae064d924b9185f551aba50aa1708585
Author: Mike Massonnet
Date: Wed Mar 6 10:48:38 2013 +0100
gtk3: Make settings dialog build with GTK3
configure.ac.in|3 +-
src/Makefile.am|2 -
src/main-settings-dialog.c | 53 ++-
3 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 17b7587..40d9578 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -43,7 +43,6 @@ AC_SUBST([MATH_LIBS], [" -lm"])
dnl Check for required packages
XDT_CHECK_LIBX11_REQUIRE()
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
@@ -55,10 +54,12 @@ if test "x$enable_gtk3" = "xyes"; then
dnl GIO 2.28 for GApplication
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.28.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
AC_DEFINE([ENABLE_GTK3], [1], [Defined if build with GTK3 is enabled])
else
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
fi
AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4870597..ad720b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ endif
# Settings dialog
#
-if !ENABLE_GTK3
bin_PROGRAMS += xfce4-notes-settings
xfce4_notes_settings_SOURCES = \
@@ -52,7 +51,6 @@ xfce4_notes_settings_LDADD =
\
@LIBXFCE4UI_LIBS@ \
@XFCONF_LIBS@ \
@UNIQUE_LIBS@
-endif
#
# Panel plugin
diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index ed96208..8c3f03c 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -21,7 +21,9 @@
#include
#endif
+#ifndef ENABLE_GTK3
#include
+#endif
#include
#include
#include
@@ -97,7 +99,11 @@ prop_dialog_new (void)
/* Dialog */
parent_window = dialog =
xfce_titled_dialog_new_with_buttons (_("Notes"), NULL,
+#ifdef ENABLE_GTK3
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+#else
GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
+#endif
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), _("Configure
the plugin"));
@@ -111,7 +117,7 @@ prop_dialog_new (void)
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), notebook);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG
(dialog))), notebook);
/* VBox */
vbox = gtk_vbox_new (FALSE, 0);
@@ -206,7 +212,7 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
/* === Ending === */
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
+ gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
return dialog;
}
@@ -266,12 +272,21 @@ tabs_combo_box_new (void)
{
GtkWidget *combobox;
+#ifdef ENABLE_GTK3
+ combobox = gtk_combo_box_text_new ();
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Top"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Right"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Bottom"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Left"));
+#else
combobox = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("None"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Top"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Right"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Bottom"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Left"));
+#endif
gtk_combo_box_set_active (GTK_COMBO_BOX (comb
[Xfce4-commits] gtk3: Use Gtk.Box.new in place of GTK.H/VBox.new
Updating branch refs/heads/master
to 8926b0120e54ab1fc053aa1f441204c1ef7f24dc (commit)
from 9090edbbae064d924b9185f551aba50aa1708585 (commit)
commit 8926b0120e54ab1fc053aa1f441204c1ef7f24dc
Author: Mike Massonnet
Date: Wed Mar 6 13:23:05 2013 +0100
gtk3: Use Gtk.Box.new in place of GTK.H/VBox.new
src/main-settings-dialog.c | 34 ++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index 8c3f03c..99cb80e 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -120,11 +120,19 @@ prop_dialog_new (void)
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG
(dialog))), notebook);
/* VBox */
+#ifdef ENABLE_GTK3
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new (FALSE, 0);
+#endif
gtk_container_add (GTK_CONTAINER (notebook), vbox);
/* === Global settings === */
+#ifdef ENABLE_GTK3
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER);
+#else
box = gtk_vbox_new (FALSE, BORDER);
+#endif
frame = xfce_gtk_frame_box_new_with_content (_("Global settings"), box);
gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -137,7 +145,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 0);
/* Notes path */
+#ifdef ENABLE_GTK3
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+#else
hbox = gtk_hbox_new (FALSE, BORDER);
+#endif
gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, FALSE, 0);
label = gtk_label_new (_("Notes path:"));
@@ -147,7 +159,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
/* Tabs position */
+#ifdef ENABLE_GTK3
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+#else
hbox = gtk_hbox_new (FALSE, BORDER);
+#endif
gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, FALSE, 0);
label = gtk_label_new (_("Tabs position:"));
@@ -157,7 +173,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
/* Background color */
+#ifdef ENABLE_GTK3
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+#else
hbox = gtk_hbox_new (FALSE, BORDER);
+#endif
gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, FALSE, 0);
label = gtk_label_new (_("Background:"));
@@ -170,7 +190,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (hbox), color_button, FALSE, FALSE, 0);
/* Font description */
+#ifdef ENABLE_GTK3
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+#else
hbox = gtk_hbox_new (FALSE, BORDER);
+#endif
gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, FALSE, 0);
label = gtk_label_new (_("Font:"));
@@ -182,7 +206,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
/* === New window settings === */
+#ifdef ENABLE_GTK3
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER);
+#else
box = gtk_vbox_new (FALSE, BORDER);
+#endif
frame = xfce_gtk_frame_box_new_with_content (_("New group settings"), box);
gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -202,7 +230,11 @@ prop_dialog_new (void)
gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 0);
/* Size */
+#ifdef ENABLE_GTK3
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+#else
hbox = gtk_hbox_new (FALSE, BORDER);
+#endif
gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, FALSE, 0);
label = gtk_label_new (_("Size:"));
@@ -582,7 +614,9 @@ color_button_new (void)
g_free (color);
button = gtk_color_button_new_with_color (&gdkcolor);
+#ifndef ENABLE_GTK3
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+#endif
g_signal_connect (button, "button-press-event", G_CALLBACK
(cb_color_button_pressed), NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Make settings dialog unique by using GtkApplication
Updating branch refs/heads/master
to 0b2d200dfe147a978e407d6a8c2d22ab6acc8156 (commit)
from 8926b0120e54ab1fc053aa1f441204c1ef7f24dc (commit)
commit 0b2d200dfe147a978e407d6a8c2d22ab6acc8156
Author: Mike Massonnet
Date: Fri Mar 8 10:21:40 2013 +0100
gtk3: Make settings dialog unique by using GtkApplication
src/main-settings-dialog.c | 25 +++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index 99cb80e..86b48a3 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -645,8 +645,7 @@ cb_color_button_pressed (GtkButton *button,
-#ifdef ENABLE_GTK3
-#else
+#ifndef ENABLE_GTK3
static UniqueResponse
cb_unique_app (UniqueApp *app,
gint command,
@@ -669,6 +668,8 @@ gint main (gint argc,
{
GtkWidget *dialog;
#ifdef ENABLE_GTK3
+ GtkApplication *app;
+ GError *error = NULL;
#else
UniqueApp *app;
#endif
@@ -676,6 +677,22 @@ gint main (gint argc,
xfconf_init (NULL);
gtk_init (&argc, &argv);
#ifdef ENABLE_GTK3
+ app = gtk_application_new ("org.xfce.NotesSettings", 0);
+
+ g_application_register (G_APPLICATION (app), NULL, &error);
+ if (error != NULL)
+{
+ g_warning ("Unable to register GApplication: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+}
+
+ if (g_application_get_is_remote (G_APPLICATION (app)))
+{
+ g_application_activate (G_APPLICATION (app));
+ g_object_unref (app);
+ return 0;
+}
#else
app = unique_app_new ("org.xfce.NotesSettings", NULL);
if (unique_app_is_running (app))
@@ -687,11 +704,15 @@ gint main (gint argc,
}
}
#endif
+
dialog = prop_dialog_new ();
+
#ifdef ENABLE_GTK3
+ g_signal_connect_swapped (app, "activate", G_CALLBACK (gtk_window_present),
dialog);
#else
g_signal_connect (app, "message-received", G_CALLBACK (cb_unique_app),
dialog);
#endif
+
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
xfconf_shutdown ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] settings: Make notebook visible and set border width 6
Updating branch refs/heads/master to 87856fa93f8e652e3d4d0554858f538f687312ac (commit) from 2566cb754a4578518d7b674d532138ccace18c89 (commit) commit 87856fa93f8e652e3d4d0554858f538f687312ac Author: Mike Massonnet Date: Mon Mar 4 17:38:37 2013 +0100 settings: Make notebook visible and set border width 6 src/defines.h |2 +- src/main-settings-dialog.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/defines.h b/src/defines.h index 0dbf312..678fc47 100644 --- a/src/defines.h +++ b/src/defines.h @@ -22,7 +22,7 @@ #define PLUGIN_WEBSITE "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"; #define PLUGIN_XFCONF_CHANNEL "xfce4-notes-plugin" -#define BORDER 8 +#define BORDER 6 #define CORNER_MARGIN 20 /* Default settings */ diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c index adbe2e5..ed96208 100644 --- a/src/main-settings-dialog.c +++ b/src/main-settings-dialog.c @@ -109,8 +109,8 @@ prop_dialog_new (void) /* Notebook */ notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (notebook), 0); + gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), TRUE); + gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), notebook); /* VBox */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] settings: Rename source file xfce4-notes-settings.c
Updating branch refs/heads/master to 2566cb754a4578518d7b674d532138ccace18c89 (commit) from 48ba69c8535508dd8f5a70071b96bd47c671b6b4 (commit) commit 2566cb754a4578518d7b674d532138ccace18c89 Author: Mike Massonnet Date: Mon Mar 4 12:57:37 2013 +0100 settings: Rename source file xfce4-notes-settings.c src/Makefile.am|2 +- ...ce4-notes-settings.c => main-settings-dialog.c} |0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8d8c565..4870597 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ bin_PROGRAMS += xfce4-notes-settings xfce4_notes_settings_SOURCES = \ defines.h \ - xfce4-notes-settings.c + main-settings-dialog.c xfce4_notes_settings_CFLAGS = \ @LIBX11_CFLAGS@ \ diff --git a/src/xfce4-notes-settings.c b/src/main-settings-dialog.c similarity index 100% rename from src/xfce4-notes-settings.c rename to src/main-settings-dialog.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Replace Gtk.H/VBox with Gtk.Box
Updating branch refs/heads/master
to 48ba69c8535508dd8f5a70071b96bd47c671b6b4 (commit)
from efaf9bad8ebd9d85548d2b1e02628028a21d367c (commit)
commit 48ba69c8535508dd8f5a70071b96bd47c671b6b4
Author: Mike Massonnet
Date: Mon Mar 4 10:30:01 2013 +0100
gtk3: Replace Gtk.H/VBox with Gtk.Box
lib/window.vala | 17 +
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/lib/window.vala b/lib/window.vala
index 5f69f91..a930327 100644
--- a/lib/window.vala
+++ b/lib/window.vala
@@ -40,7 +40,11 @@ namespace Xnp {
private Xnp.TitleBarButton left_arrow_button;
private Xnp.TitleBarButton right_arrow_button;
private Xnp.TitleBarButton close_button;
+#if ENABLE_GTK3
+ private Gtk.Box content_box;
+#else
private Gtk.VBox content_box;
+#endif
private Gtk.Notebook notebook;
private Gtk.UIManager ui;
@@ -215,13 +219,22 @@ namespace Xnp {
frame.modify_style (style);
frame.show ();
add (frame);
+#if ENABLE_GTK3
+ var vbox_frame = new Gtk.Box (Gtk.Orientation.VERTICAL,
0);
+#else
var vbox_frame = new Gtk.VBox (false, 0);
+#endif
+
vbox_frame.spacing = 1;
vbox_frame.show ();
frame.add (vbox_frame);
/* Build title bar */
+#if ENABLE_GTK3
+ var title_box = new Gtk.Box
(Gtk.Orientation.HORIZONTAL, 0);
+#else
var title_box = new Gtk.HBox (false, 0);
+#endif
var menu_evbox = new Gtk.EventBox ();
menu_evbox.tooltip_text = _("Menu");
menu_evbox.set_visible_window (false);
@@ -271,7 +284,11 @@ namespace Xnp {
vbox_frame.pack_start (title_box, false, false, 0);
/* Build content box */
+#if ENABLE_GTK3
+ this.content_box = new Gtk.Box
(Gtk.Orientation.VERTICAL, 0);
+#else
this.content_box = new Gtk.VBox (false, 0);
+#endif
this.content_box.show ();
vbox_frame.pack_start (this.content_box, true, true, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] vala: Shut up cast warning from int to pointer
Updating branch refs/heads/master
to efaf9bad8ebd9d85548d2b1e02628028a21d367c (commit)
from f3509117abbea85cbf65506c47a8430eb5392db0 (commit)
commit efaf9bad8ebd9d85548d2b1e02628028a21d367c
Author: Mike Massonnet
Date: Mon Mar 4 10:20:15 2013 +0100
vala: Shut up cast warning from int to pointer
Use to_pointer() which converts to GINT_TO_POINTER instead of (void*).
lib/window.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/window.vala b/lib/window.vala
index 6d36cfe..5f69f91 100644
--- a/lib/window.vala
+++ b/lib/window.vala
@@ -763,7 +763,7 @@ namespace Xnp {
image = new
Gtk.Image.from_stock (Gtk.Stock.GO_FORWARD, Gtk.IconSize.MENU);
((Gtk.ImageMenuItem)mi).set_image (image);
}
- mi.set_data ("page", (void*)p);
+ mi.set_data ("page",
p.to_pointer ());
mi.activate.connect ((i) => {
int page =
i.get_data ("page");
notebook.set_current_page (page);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Use FontChooser instead of FontSelection
Updating branch refs/heads/master
to f3509117abbea85cbf65506c47a8430eb5392db0 (commit)
from d155b3f066fc6dcc30074680b14a2a5711d716c8 (commit)
commit f3509117abbea85cbf65506c47a8430eb5392db0
Author: Mike Massonnet
Date: Mon Mar 4 09:58:47 2013 +0100
gtk3: Use FontChooser instead of FontSelection
FontSelection is deprecated in GTK+3.
NB: the code is actually not used, may be useful for giving an
option for none global font description in the future.
lib/window.vala |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/lib/window.vala b/lib/window.vala
index d16f8b4..6d36cfe 100644
--- a/lib/window.vala
+++ b/lib/window.vala
@@ -1089,12 +1089,21 @@ namespace Xnp {
return;
var note = (Xnp.Note)(this.notebook.get_nth_page
(page));
+#if ENABLE_GTK3
+ var dialog = new Gtk.FontChooserDialog ("Choose current
note font", this);
+ dialog.set_font (note.text_view.font);
+#else
var dialog = new Gtk.FontSelectionDialog ("Choose
current note font");
dialog.set_font_name (note.text_view.font);
+#endif
int res = dialog.run ();
dialog.hide ();
if (res == Gtk.ResponseType.OK) {
+#if ENABLE_GTK3
+ note.text_view.font = dialog.get_font ();
+#else
note.text_view.font = dialog.get_font_name ();
+#endif
}
dialog.destroy ();
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make Xnp.Note inherit from Gtk.ScrolledWindow
Updating branch refs/heads/master
to d155b3f066fc6dcc30074680b14a2a5711d716c8 (commit)
from e3f1701009da8e5eeb247a985a63e7391e6baa3e (commit)
commit d155b3f066fc6dcc30074680b14a2a5711d716c8
Author: Mike Massonnet
Date: Fri Mar 1 20:09:48 2013 +0100
Make Xnp.Note inherit from Gtk.ScrolledWindow
Forget about the Gtk.Bin implementation, and replace it with
Gtk.ScrolledWindow. The class Xnp.Note is anyway using the
Gtk.ScrolledWindow inside Gtk.Bin.
lib/note.vala | 54 --
1 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/lib/note.vala b/lib/note.vala
index fb6b798..3d4266e 100644
--- a/lib/note.vala
+++ b/lib/note.vala
@@ -22,9 +22,8 @@ using Pango;
namespace Xnp {
- public class Note : Gtk.Bin {
+ public class Note : Gtk.ScrolledWindow {
- public Gtk.ScrolledWindow scrolled_window;
public Xnp.HypertextView text_view;
public new string name { get; set; }
@@ -55,19 +54,17 @@ namespace Xnp {
this.name = name;
- this.scrolled_window = new Gtk.ScrolledWindow (null,
null);
- this.scrolled_window.set_policy
(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+ this.set_policy (Gtk.PolicyType.AUTOMATIC,
Gtk.PolicyType.AUTOMATIC);
this.text_view = new Xnp.HypertextView ();
+ this.text_view.show ();
this.text_view.wrap_mode = Gtk.WrapMode.WORD;
this.text_view.left_margin = 2;
this.text_view.right_margin = 2;
this.text_view.pixels_above_lines = 1;
this.text_view.pixels_below_lines = 1;
- this.scrolled_window.add (this.text_view);
- this.scrolled_window.show_all ();
- add (this.scrolled_window);
+ add (this.text_view);
var buffer = this.text_view.get_buffer ();
buffer.changed.connect (buffer_changed_cb);
@@ -77,49 +74,6 @@ namespace Xnp {
this.dirty = false;
}
-#if ENABLE_GTK3
- public override void get_preferred_width (out int
minimum_width, out int natural_width) {
- var child = this.get_child ();
- if (child != null && child.get_visible ()) {
- child.get_preferred_width (out minimum_width,
out natural_width);
- }
- else {
- minimum_width = 0;
- natural_width = 0;
- }
- }
-
- public override void get_preferred_height (out int
minimum_height, out int natural_height) {
- var child = this.get_child ();
- if (child != null && child.get_visible ()) {
- child.get_preferred_height (out minimum_height,
out natural_height);
- }
- else {
- minimum_height = 0;
- natural_height = 0;
- }
- }
-#else
- public override void size_request (ref Gtk.Requisition
requisition) {
- Gtk.Requisition child_requisition;
- if (this.child != null && (this.child.get_visible ())) {
- this.child.size_request (out child_requisition);
- requisition = child_requisition;
- }
- else {
- requisition.width = 0;
- requisition.height = 0;
- }
- }
-
- public override void size_allocate (Gdk.Rectangle allocation) {
- this.allocation = (Gtk.Allocation)allocation;
- if (this.child != null && this.child.get_visible ()) {
- this.child.size_allocate (allocation);
- }
- }
-#endif
-
/*
* Signal callbacks
*/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Keep style_context inside a single variable
Updating branch refs/heads/master
to e3f1701009da8e5eeb247a985a63e7391e6baa3e (commit)
from 7545a16d7fcd97dd308b2a3d5f986330b81003f5 (commit)
commit e3f1701009da8e5eeb247a985a63e7391e6baa3e
Author: Mike Massonnet
Date: Fri Mar 1 10:11:59 2013 +0100
gtk3: Keep style_context inside a single variable
lib/icon-button.vala |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/icon-button.vala b/lib/icon-button.vala
index 5b7fb7f..12e0d4f 100644
--- a/lib/icon-button.vala
+++ b/lib/icon-button.vala
@@ -44,10 +44,11 @@ namespace Xnp {
protected void set_widget_source_color (Cairo.Context cr) {
#if ENABLE_GTK3
+ var style_context = get_style_context ();
+
if (sensitive && active) {
int width = get_allocated_width ();
int height = get_allocated_height ();
- var style_context = get_style_context ();
style_context.save ();
style_context.add_class
(Gtk.STYLE_CLASS_BUTTON);
style_context.render_frame (cr, 0, 0, width,
height);
@@ -56,9 +57,9 @@ namespace Xnp {
Gdk.cairo_set_source_rgba (cr,
style_context.get_color (Gtk.StateFlags.PRELIGHT));
}
else if (sensitive && !active)
- Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.NORMAL));
+ Gdk.cairo_set_source_rgba (cr,
style_context.get_color (Gtk.StateFlags.NORMAL));
else if (!sensitive)
- Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.INSENSITIVE));
+ Gdk.cairo_set_source_rgba (cr,
style_context.get_color (Gtk.StateFlags.INSENSITIVE));
#else
if (sensitive && active)
Gdk.cairo_set_source_color (cr,
style.base[Gtk.StateType.NORMAL]);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] vala: Use newer Gtk.Stock.* syntax
Updating branch refs/heads/master
to 7545a16d7fcd97dd308b2a3d5f986330b81003f5 (commit)
from c4ef8d9288b70baf112806ef694db53457e9f1be (commit)
commit 7545a16d7fcd97dd308b2a3d5f986330b81003f5
Author: Mike Massonnet
Date: Fri Mar 1 09:07:10 2013 +0100
vala: Use newer Gtk.Stock.* syntax
src/main-status-icon.vala |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main-status-icon.vala b/src/main-status-icon.vala
index 06bfd68..6f3b247 100644
--- a/src/main-status-icon.vala
+++ b/src/main-status-icon.vala
@@ -58,18 +58,18 @@ static Gtk.Menu build_context_menu () {
mi = new Gtk.SeparatorMenuItem ();
menu.append (mi);
- mi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_PROPERTIES, null);
+ mi = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.PROPERTIES, null);
mi.activate.connect (() => { application.open_settings_dialog (); });
menu.append (mi);
- mi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_ABOUT, null);
+ mi = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.ABOUT, null);
mi.activate.connect (() => { application.open_about_dialog (); });
menu.append (mi);
mi = new Gtk.SeparatorMenuItem ();
menu.append (mi);
- mi = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_REMOVE, null);
+ mi = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.REMOVE, null);
mi.activate.connect (() => {
application.save_notes ();
Xfce.Autostart.@set ("xfce4-notes-autostart", "xfce4-notes",
true);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk3: Ignore panel plugin from build toolchain
Updating branch refs/heads/master to c4ef8d9288b70baf112806ef694db53457e9f1be (commit) from 9ff1dc87f6eb52389a95b6364662006d4c43d0ce (commit) commit c4ef8d9288b70baf112806ef694db53457e9f1be Author: Mike Massonnet Date: Fri Mar 1 09:03:50 2013 +0100 gtk3: Ignore panel plugin from build toolchain The Xfce Panel is not yet compatible with GTK3 therefore it's impossible to build a panel plugin. src/Makefile.am accordingly updated to avoid building the panel plugin. configure.ac.in warns that GTK3 support is only experimental. configure.ac.in | 16 +++- src/Makefile.am |8 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index fae6f31..17b7587 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -45,7 +45,6 @@ XDT_CHECK_LIBX11_REQUIRE() XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) dnl Check for GTK @@ -64,6 +63,11 @@ else fi AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"]) +dnl Check for Xfce Panel +if test "x$enable_gtk3" = "xno" ; then +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) +fi + dnl Check for valac if test "x$USE_MAINTAINER_MODE" = "xyes" ; then AM_PROG_VALAC([0.16.0]) @@ -106,11 +110,21 @@ echo "* Maintainer Mode:$USE_MAINTAINER_MODE" if test "x$USE_MAINTAINER_MODE" = "xyes" ; then echo echo "* Vala: $VALAC $am__vala_version" +if test "x$enable_gtk3" = "xno" ; then echo "* Xfce4-vala: $XFCE4VALA_VERSION" +fi echo fi echo "* GTK+: $GTK_VERSION" +if test "x$enable_gtk3" = "xyes" ; then +echo "* W" +echo "* W GTK3 support is only experimental, don't use for production." +echo "* W" +echo +fi +if test "x$enable_gtk3" = "xno" ; then echo "* Xfce Panel: $LIBXFCE4PANEL_VERSION" +fi echo "* Debug Support: $enable_debug" echo diff --git a/src/Makefile.am b/src/Makefile.am index 75e9b7c..8d8c565 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,6 +58,10 @@ endif # Panel plugin # +if !ENABLE_GTK3 +# REM Xfce Panel is not yet built with GTK3 support +# hence it's impossible to build a panel plugin yet + if MAINTAINER_MODE notes_VALAFLAGS = \ --vapidir=$(top_srcdir)/lib \ @@ -101,6 +105,10 @@ libnotes_la_LIBADD = \ @LIBXFCE4UTIL_LIBS@ \ @XFCONF_LIBS@ +else +BUILT_SOURCES = +endif + # # Status icon # ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Hide label "Translation of this page" in header
Updating branch refs/heads/master
to 2494b538b322c651be6006785c0e3eab34001b95 (commit)
from dd7e14b857905b8cb3987ec261f524c6417fa6fb (commit)
commit 2494b538b322c651be6006785c0e3eab34001b95
Author: Mike Massonnet
Date: Mon Jan 14 22:17:59 2013 +0100
Hide label "Translation of this page" in header
lib/tpl/xfce/css/_translation.css |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lib/tpl/xfce/css/_translation.css
b/lib/tpl/xfce/css/_translation.css
index 4c32449..9511535 100644
--- a/lib/tpl/xfce/css/_translation.css
+++ b/lib/tpl/xfce/css/_translation.css
@@ -7,6 +7,10 @@ div.plugin_translation {
font-size: 0.925em !important;
}
+div.plugin_translation > span {
+ display: none;
+}
+
div.plugin_translation select {
background-color: transparent !important;
color: #333 !important;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Media manager links in right-floating-toolbox and in the footer
Updating branch refs/heads/master
to 04f7f3a3f5bcd4a98194aa9f164922fbc2768650 (commit)
from 1fff87b3497f0d24c5644e42679a5b3e07fcc351 (commit)
commit 04f7f3a3f5bcd4a98194aa9f164922fbc2768650
Author: Mike Massonnet
Date: Thu Jan 10 18:34:56 2013 +0100
Media manager links in right-floating-toolbox and in the footer
lib/tpl/xfce/main.php |1 +
lib/tpl/xfce/tpl_footer.php |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php
index 38bcd4e..3721d31 100644
--- a/lib/tpl/xfce/main.php
+++ b/lib/tpl/xfce/main.php
@@ -91,6 +91,7 @@ else {
tpl_action('revisions', 1, 'li', 0, '',
'');
tpl_action('backlink', 1, 'li', 0, '',
'');
tpl_action('subscribe', 1, 'li', 0, '',
'');
+tpl_action('media', 1, 'li', 0, '',
'');
tpl_action('top', 1, 'li', 0, '',
'');
?>
diff --git a/lib/tpl/xfce/tpl_footer.php b/lib/tpl/xfce/tpl_footer.php
index 338921c..35a80a4 100644
--- a/lib/tpl/xfce/tpl_footer.php
+++ b/lib/tpl/xfce/tpl_footer.php
@@ -17,6 +17,7 @@ if (!defined('DOKU_INC')) die();
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set font-weight dt tags normal instead of bold
Updating branch refs/heads/master
to 1fff87b3497f0d24c5644e42679a5b3e07fcc351 (commit)
from 81eb193c014b8e51b2093094f35a401e3b22f2c1 (commit)
commit 1fff87b3497f0d24c5644e42679a5b3e07fcc351
Author: Mike Massonnet
Date: Thu Jan 10 18:30:12 2013 +0100
Set font-weight dt tags normal instead of bold
lib/tpl/xfce/css/basic.css |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/tpl/xfce/css/basic.css b/lib/tpl/xfce/css/basic.css
index 2d578f7..21e8b01 100644
--- a/lib/tpl/xfce/css/basic.css
+++ b/lib/tpl/xfce/css/basic.css
@@ -126,7 +126,7 @@ dd {
margin: 0 1.5em 0 0;
}
dt {
-font-weight: bold;
+font-weight: normal !important;
margin: 0;
padding: 0;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Added a default xfce-header.html without any active link
Updating branch refs/heads/master
to 81eb193c014b8e51b2093094f35a401e3b22f2c1 (commit)
from a4ccfe5944053e4ebd6f33f9fad488f6f0c58b99 (commit)
commit 81eb193c014b8e51b2093094f35a401e3b22f2c1
Author: Mike Massonnet
Date: Thu Jan 10 18:28:10 2013 +0100
Added a default xfce-header.html without any active link
lib/tpl/xfce/main.php |3 +++
...-header-docs-xfce-org.html => xfce-header.html} |2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php
index 36e13f2..38bcd4e 100644
--- a/lib/tpl/xfce/main.php
+++ b/lib/tpl/xfce/main.php
@@ -34,6 +34,9 @@ if (strstr(DOKU_URL, "wiki.xfce.org")) {
else if (strstr(DOKU_URL, "docs.xfce.org")) {
tpl_includeFile('xfce-header-docs-xfce-org.html');
}
+else {
+tpl_includeFile('xfce-header.html');
+}
?>
diff --git a/lib/tpl/xfce/xfce-header-docs-xfce-org.html
b/lib/tpl/xfce/xfce-header.html
similarity index 96%
copy from lib/tpl/xfce/xfce-header-docs-xfce-org.html
copy to lib/tpl/xfce/xfce-header.html
index b41911e..88c3e64 100644
--- a/lib/tpl/xfce/xfce-header-docs-xfce-org.html
+++ b/lib/tpl/xfce/xfce-header.html
@@ -5,7 +5,7 @@
http://www.xfce.org"; title="Go to the
homepage">Home
- http://docs.xfce.org"; title="Official documentation"
class="active">Docs
+ http://docs.xfce.org"; title="Official
documentation">Docs
http://archive.xfce.org"; title="Download location of
tarballs">Archive
http://wiki.xfce.org"; title="Community
documentation">Wiki
http://forum.xfce.org"; title="Community
forums">Forum
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Include right xfce banner depending on hostname
Updating branch refs/heads/master to a4ccfe5944053e4ebd6f33f9fad488f6f0c58b99 (commit) from 6a62571f3d3460202062dc378b1e0cd13383cb74 (commit) commit a4ccfe5944053e4ebd6f33f9fad488f6f0c58b99 Author: Mike Massonnet Date: Thu Jan 10 00:10:42 2013 +0100 Include right xfce banner depending on hostname lib/tpl/xfce/main.php |9 - ...-header.html => xfce-header-docs-xfce-org.html} |4 ++-- ...-header.html => xfce-header-wiki-xfce-org.html} |0 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php index 1fdd575..36e13f2 100644 --- a/lib/tpl/xfce/main.php +++ b/lib/tpl/xfce/main.php @@ -27,7 +27,14 @@ $showSidebar = $hasSidebar && ($ACT=='show'); - + http://www.xfce.org"; title="Go to the homepage">Home - http://docs.xfce.org"; title="Official documentation">Docs + http://docs.xfce.org"; title="Official documentation" class="active">Docs http://archive.xfce.org"; title="Download location of tarballs">Archive - http://wiki.xfce.org"; title="Community documentation" class="active">Wiki + http://wiki.xfce.org"; title="Community documentation">Wiki http://forum.xfce.org"; title="Community forums">Forum https://bugzilla.xfce.org"; title="Report and track bugs">Bugs http://blog.xfce.org"; title="Visit the blog">Blog diff --git a/lib/tpl/xfce/xfce-header.html b/lib/tpl/xfce/xfce-header-wiki-xfce-org.html similarity index 100% rename from lib/tpl/xfce/xfce-header.html rename to lib/tpl/xfce/xfce-header-wiki-xfce-org.html ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Drop docs template
Updating branch refs/heads/master
to f9013085130b3063670a444329ab38b112f8510f (commit)
from e285207e98578169161aaad4de7ec49700698867 (commit)
commit f9013085130b3063670a444329ab38b112f8510f
Author: Mike Massonnet
Date: Wed Jan 9 23:29:32 2013 +0100
Drop docs template
lib/tpl/docs/_admin.css | 48
lib/tpl/docs/_linkwiz.css | 68 --
lib/tpl/docs/_mediaoptions.css| 92
lib/tpl/docs/_subscription.css| 21 --
lib/tpl/docs/_xfceheader.css | 50
lib/tpl/docs/design.css | 464 -
lib/tpl/docs/detail.php | 89 ---
lib/tpl/docs/images/link_icon.png | Bin 378 -> 0 bytes
lib/tpl/docs/images/logosmall.png | Bin 4288 -> 0 bytes
lib/tpl/docs/images/mail_icon.png | Bin 324 -> 0 bytes
lib/tpl/docs/layout.css | 42
lib/tpl/docs/main.php | 112 -
lib/tpl/docs/media.css| 205
lib/tpl/docs/mediamanager.php | 44
lib/tpl/docs/print.css| 228 --
lib/tpl/docs/rtl.css | 154
lib/tpl/docs/style.ini| 71 --
17 files changed, 0 insertions(+), 1688 deletions(-)
diff --git a/lib/tpl/docs/_admin.css b/lib/tpl/docs/_admin.css
deleted file mode 100644
index 6c8066b..000
--- a/lib/tpl/docs/_admin.css
+++ /dev/null
@@ -1,48 +0,0 @@
-#admin__version {
-clear:left;
-float: right;
-color: __text_neu__;
-}
-
-.dokuwiki ul.admin_tasks {
-font-size: 115%;
-float: left;
-width: 40%;
-list-style-type: none;
-}
-
-.dokuwiki ul.admin_tasks li {
-line-height: 22px;
-padding-left: 35px;
-margin: 1em 0;
-background: transparent none no-repeat scroll 0 0;
-text-align: left;
-}
-
-.dokuwiki ul.admin_tasks li div.li {
-font-weight: bold;
-}
-
-.dokuwiki ul.admin_tasks li.admin_acl {
-background-image: url(../../images/admin/acl.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_usermanager {
-background-image: url(../../images/admin/usermanager.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_plugin {
-background-image: url(../../images/admin/plugin.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_config {
-background-image: url(../../images/admin/config.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_revert {
-background-image: url(../../images/admin/revert.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_popularity {
-background-image: url(../../images/admin/popularity.png);
-}
diff --git a/lib/tpl/docs/_linkwiz.css b/lib/tpl/docs/_linkwiz.css
deleted file mode 100644
index 0607073..000
--- a/lib/tpl/docs/_linkwiz.css
+++ /dev/null
@@ -1,68 +0,0 @@
-#link__wiz {
-position: absolute;
-display: block;
-z-index: 99;
-width: 300px;
-height: 250px;
-padding: 0;
-margin: 0;
-overflow: hidden;
-border: 1px solid __border__;
-background-color: __background_neu__;
-text-align: center;
-}
-
-#link__wiz_header {
-background-color: __background_alt__;
-height: 16px;
-margin-bottom: 5px;
-}
-
-#link__wiz_close {
-cursor: pointer;
-margin: 0;
-}
-
-#link__wiz_result {
-background-color: __background__;
-width: 293px;
-height: 193px;
-overflow: auto;
-border: 1px solid __border__;
-margin: 3px auto;
-text-align: left;
-}
-
-#link__wiz_result div.type_u {
-padding: 3px 3px 3px 22px;
-background: transparent url(../../images/up.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_f {
-padding: 3px 3px 3px 22px;
-background: transparent url(../../images/page.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_d {
-padding: 3px 3px 3px 22px;
-background: transparent url(../../images/ns.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.even {
-background-color: __background_neu__;
-}
-
-#link__wiz_result div.selected {
-background-color: __background_alt__;
-}
-
-#link__wiz_result span {
-display: block;
-color: __text_neu__;
-}
-
-/*FIXME maybe move to a more general style sheet*/
-.ondrag {
-cursor: move;
-opacity: 0.8;
-}
diff --git a/lib/tpl/docs/_mediaoptions.css b/lib/tpl/docs/_mediaoptions.css
deleted file mode 100644
index 19e2c48..000
--- a/lib/tpl/docs/_mediaoptions.css
+++ /dev/null
@@ -1,92 +0,0 @@
-/* --- popup --- */
-
-#media__popup {
-background-color:__background__;
-display:none;
-border: 1px solid __border__;
-position: absolute;
-width:280px;
-}
-
-#media__popup h1 {
-text-align:center;
-font-weight:normal;
-background-color: __background_alt__;
-height: 16px;
-margin-bottom: 5px;
-font-size:12px;
-border-bottom: 0;
-}
-
-#media__popup p {
-display:block;
-line-height:14pt;
-margin:0.5em;
-}
-
-#media_nolink {
-padding:4px 0;
-}
-
-#media__popup label {
-float:left;
-width:9em;
-}
-
-#media__popup .button {
-margin-left:auto;
-margin-r
[Xfce4-commits] Update goodies template -> hide TOC
Updating branch refs/heads/master
to e285207e98578169161aaad4de7ec49700698867 (commit)
from 39aff44fa1f35ce9d03b1a9aa582cc49007ea6c5 (commit)
commit e285207e98578169161aaad4de7ec49700698867
Author: Mike Massonnet
Date: Wed Jan 9 23:26:40 2013 +0100
Update goodies template -> hide TOC
lib/tpl/goodies/style.css |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/tpl/goodies/style.css b/lib/tpl/goodies/style.css
index 6469839..d444e72 100644
--- a/lib/tpl/goodies/style.css
+++ b/lib/tpl/goodies/style.css
@@ -83,6 +83,7 @@ body {
.menu a:hover { color: #ffb733; }
/* PAGEMAP =
*/
+#dw__toc { display: none; }
.pagemap .menubody .toc .level1 { list-style: none; }
.pagemap .menubody .toc .level1 a { color: #f4a600; font-weight: bold; }
.pagemap .menubody .toc .level1 a:hover { color: #ffb733; }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix for base property Gtk.Widget.name
Updating branch refs/heads/master
to 65eca0836c259510e1eca9480b58009c49541328 (commit)
from b4fbbd60e6b44b350baca709126f2fc82c5906e6 (commit)
commit 65eca0836c259510e1eca9480b58009c49541328
Author: Mike Massonnet
Date: Sun Nov 11 16:30:58 2012 +0100
Fix for base property Gtk.Widget.name
lib/window.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/window.vala b/lib/window.vala
index e44b6cb..d16f8b4 100644
--- a/lib/window.vala
+++ b/lib/window.vala
@@ -172,7 +172,7 @@ namespace Xnp {
public signal void note_renamed (Xnp.Note note, string
old_name);
construct {
- base.name = "notes-window";
+ ((Gtk.Widget)this).name = "notes-window";
this.title = _("Notes");
this.deletable = false;
this.skip_taskbar_hint = true;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Button effect for IconButton on mouse hover (only GTK+3)
Updating branch refs/heads/master
to b4fbbd60e6b44b350baca709126f2fc82c5906e6 (commit)
from 00e6df9fcdb4ef3b23dd4eca33d0d94d9a2a18a4 (commit)
commit b4fbbd60e6b44b350baca709126f2fc82c5906e6
Author: Mike Massonnet
Date: Sun Nov 11 00:05:14 2012 +0100
Button effect for IconButton on mouse hover (only GTK+3)
Since GTK+3 has only background and foreground colors, the icon-button class
has a button like effect on mouse hover when sensitive.
lib/icon-button.vala | 15 +--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/icon-button.vala b/lib/icon-button.vala
index 670691f..5b7fb7f 100644
--- a/lib/icon-button.vala
+++ b/lib/icon-button.vala
@@ -31,7 +31,9 @@ namespace Xnp {
set_visible_window (false);
set_above_child (true);
set_size_request (22, 22);
+#if !ENABLE_GTK3
set_border_width (2);
+#endif
enter_notify_event.connect (on_enter_notify_event);
leave_notify_event.connect (on_leave_notify_event);
@@ -42,8 +44,17 @@ namespace Xnp {
protected void set_widget_source_color (Cairo.Context cr) {
#if ENABLE_GTK3
- if (sensitive && active)
- Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.PRELIGHT));
+ if (sensitive && active) {
+ int width = get_allocated_width ();
+ int height = get_allocated_height ();
+ var style_context = get_style_context ();
+ style_context.save ();
+ style_context.add_class
(Gtk.STYLE_CLASS_BUTTON);
+ style_context.render_frame (cr, 0, 0, width,
height);
+ style_context.render_background (cr, 0, 0,
width, height);
+ style_context.restore ();
+ Gdk.cairo_set_source_rgba (cr,
style_context.get_color (Gtk.StateFlags.PRELIGHT));
+ }
else if (sensitive && !active)
Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.NORMAL));
else if (!sensitive)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update README and bump notes version
Updating branch refs/heads/master
to 00e6df9fcdb4ef3b23dd4eca33d0d94d9a2a18a4 (commit)
from 60d7702c2802533f80ef2fb5c9b4248c50d8e1f7 (commit)
commit 00e6df9fcdb4ef3b23dd4eca33d0d94d9a2a18a4
Author: Mike Massonnet
Date: Sat Nov 10 22:15:04 2012 +0100
Update README and bump notes version
README | 58 +++---
autogen.sh | 21 +---
configure.ac.in |8 +++---
3 files changed, 30 insertions(+), 57 deletions(-)
diff --git a/README b/README
index 00161d8..2fc2e7c 100644
--- a/README
+++ b/README
@@ -5,34 +5,27 @@ The notes plugin provides you a quick way to write down a
todo list,
to paste a piece of code, to leave a note to your friend, or whatever
else you had like to do with a post'it.
- “ I like to write down a todo list and mark what I did,
- and once I'm done with the whole job I destroy the note.
+ ___Todo_list___
- ___Todo_list___
-
- ☑ Show an example
- ☑ Show some UTF8 codes
- ☐ Release a new version
-
- ___Random_thoughts___
-
- ☐ Add bold/italic/… style
- ☐ Hope this gives you some ideas
-
- ___UTF8_codes___
-
- Type Ctrl+Shift+u in GTK+ applications
-
- — 2014 “ 201C
- ” 201D ‣ 2023
- … 2026 ⁂ 2042
- ☐ 2610 ☑ 2611
+ ☑ Show an example
+ ☑ Show some UTF8 codes
+ ☐ Release a new version
- Update 2009-06-06: actually I switched to the application
- Tasks from the Pimlico project in regard to todo lists.
- ”, Mike
+ ___Random_thoughts___
+
+ ☐ Add bold/italic/… style
+ ☐ Hope this gives you some ideas
+
+ ___UTF8_codes___
+
+ Type Ctrl+Shift+u in GTK+ applications
+
+ — 2014 “ 201C
+ ” 201D ‣ 2023
+ … 2026 ⁂ 2042
+ ☐ 2610 ☑ 2611
-The notes are saved under $XDG_DATA_HOME/notes/[0]. This way you can
+The notes are saved under $XDG_DATA_HOME/notes/[0]. This way you can
continue to access your notes remotely, if you have a SSH account for
example, and fire up your favorite editor ^_~
@@ -43,7 +36,7 @@ directory specification[1] and defaults to $HOME/.local/share.
You most probably want to tweak Xfwm4 by disabling the “Skip windows
that have skip pager or skip taskbar properties set” (cf. Settings >
-Window Manager Tweaks > Cycling). The reason is that the notes plugin
+Window Manager Tweaks > Cycling). The reason is that the notes plugin
sets the skip pager hint so it doesn't clutter your pager, but you still
want to access your notes by cycling to them (Alt+Tab by default).
@@ -57,13 +50,12 @@
http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
Dependencies
--
-* glib 2.14
-* gtk+ 2.14
-* libxfcegui4 4.4.0
-* libxfce4util 4.4.0
-* libxfce4panel 4.4.0
-* xfconf 4.6.0
-* unique 1.0.0
+* glib 2.24
+* gtk+ 2.28 (or 3.2)
+* libxfce4util 4.10
+* libxfce4panel 4.10
+* xfconf 4.10
+* unique 1.0 (with gtk+ 2.28 only)
Install
diff --git a/autogen.sh b/autogen.sh
index 5d74889..d568f0d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,4 @@
#!/bin/sh
-#
-# $Id$
-#
-# Copyright (c) 2002-2006
-# The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer .
-#
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 </dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}'`
-if [ -d .git ]; then
-revision=$(git log --pretty=format:%h -n 1)
-else
-revision=UNKNOWN
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
--e "s/@REVISION@/${revision}/g" \
-< "configure.ac.in" > "configure.ac"
-
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
exec xdt-autogen $@
-# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index b3c74b6..fae6f31 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2,12 +2,12 @@ dnl
dnl xfce4-notes-plugin - Notes plugin for the Xfce4 panel
dnl
dnl 2003 Jakob Henriksson
-dnl 2006-2010 Mike Massonnet
+dnl 2006-2012 Mike Massonnet
dnl
m4_define([xfce4_notes_plugin_version_major], [1])
-m4_define([xfce4_notes_plugin_version_minor], [7])
-m4_define([xfce4_notes_plugin_version_micro], [8])
+m4_define([xfce4_notes_plugin_version_minor], [8])
+m4_define([xfce4_notes_plugin_version_micro], [0])
m4_define([xfce4_notes_plugin_version_nano], [])
m4_define([xfce4_notes_plugin_version_build], [@REVISION@])
m4_define([xfce4_notes_plugin_version_tag], [git]) # Leave empty for releases
@@ -22,7 +22,7 @@ AC_CAN
[Xfce4-commits] Fix "draw" handler for XnpIconButton class
Updating branch refs/heads/master
to 60d7702c2802533f80ef2fb5c9b4248c50d8e1f7 (commit)
from 25059a54c007884fca6d443126bce884be8c7c0e (commit)
commit 60d7702c2802533f80ef2fb5c9b4248c50d8e1f7
Author: Mike Massonnet
Date: Sat Nov 3 22:00:30 2012 +0100
Fix "draw" handler for XnpIconButton class
lib/icon-button.vala | 18 +++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/icon-button.vala b/lib/icon-button.vala
index 4396f11..670691f 100644
--- a/lib/icon-button.vala
+++ b/lib/icon-button.vala
@@ -41,12 +41,21 @@ namespace Xnp {
protected abstract void draw_icon (Cairo.Context cr, int width,
int height);
protected void set_widget_source_color (Cairo.Context cr) {
+#if ENABLE_GTK3
+ if (sensitive && active)
+ Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.PRELIGHT));
+ else if (sensitive && !active)
+ Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.NORMAL));
+ else if (!sensitive)
+ Gdk.cairo_set_source_rgba (cr,
get_style_context ().get_color (Gtk.StateFlags.INSENSITIVE));
+#else
if (sensitive && active)
Gdk.cairo_set_source_color (cr,
style.base[Gtk.StateType.NORMAL]);
else if (sensitive && !active)
Gdk.cairo_set_source_color (cr,
style.fg[Gtk.StateType.INSENSITIVE]);
else if (!sensitive)
Gdk.cairo_set_source_color (cr,
style.text[Gtk.StateType.INSENSITIVE]);
+#endif
}
public override void add (Gtk.Widget widget) {
@@ -55,9 +64,13 @@ namespace Xnp {
#if ENABLE_GTK3
public override bool draw (Cairo.Context cr) {
+ int width = get_allocated_width ();
+ int height = get_allocated_height ();
+ draw_icon (cr, width, height);
+ return false;
+ }
#else
public override bool expose_event (Gdk.EventExpose event) {
-#endif
Gtk.Allocation allocation;
get_allocation (out allocation);
@@ -66,9 +79,7 @@ namespace Xnp {
int x = allocation.width / 2 - width / 2 + allocation.x;
int y = allocation.height / 2 - height / 2 +
allocation.y;
-#if !ENABLE_GTK3
var cr = Gdk.cairo_create (get_window ());
-#endif
cr.rectangle (x, y, width, height);
cr.clip ();
@@ -80,6 +91,7 @@ namespace Xnp {
return false;
}
+#endif
private bool on_enter_notify_event (Gdk.EventCrossing event) {
active = true;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update code to build with GTK+3
Updating branch refs/heads/master
to 2b666709e374d93e8ef6bd84577a1700aa3e60a0 (commit)
from de5772612cb466ee1aebc8ff1021f1f15881 (commit)
commit 2b666709e374d93e8ef6bd84577a1700aa3e60a0
Author: Mike Massonnet
Date: Wed Oct 31 22:58:01 2012 +0100
Update code to build with GTK+3
data/vapi/gtk214/gtk+-2.0.vapi |2 +-
lib/application.vala | 27 +
lib/hypertextview.vala |6 +-
lib/icon-button.vala | 15 ++-
lib/note.vala | 28 +-
lib/window.vala| 81 +++-
src/main-panel-plugin.vala |2 +
src/main-status-icon.vala |8 +++-
8 files changed, 124 insertions(+), 45 deletions(-)
diff --git a/data/vapi/gtk214/gtk+-2.0.vapi b/data/vapi/gtk214/gtk+-2.0.vapi
index 70034b7..db78073 100644
--- a/data/vapi/gtk214/gtk+-2.0.vapi
+++ b/data/vapi/gtk214/gtk+-2.0.vapi
@@ -5098,7 +5098,7 @@ namespace Gtk {
public class unowned GLib.ParamSpec find_style_property (string
property_name);
public void freeze_child_notify ();
public virtual unowned Atk.Object get_accessible ();
- public void get_allocation (Gtk.Allocation allocation);
+ public void get_allocation (out Gtk.Allocation allocation);
public unowned Gtk.Widget get_ancestor (GLib.Type widget_type);
public bool get_app_paintable ();
public bool get_can_default ();
diff --git a/lib/application.vala b/lib/application.vala
index 3872a6a..9a5e674 100644
--- a/lib/application.vala
+++ b/lib/application.vala
@@ -367,7 +367,7 @@ namespace Xnp {
string[] tabs_order =
win.get_note_names ();
int last_page = win.get_current_page ();
int transparency = (int)((1 -
win.opacity) * 100);
- bool visible = (bool)(win.get_flags ()
& Gtk.WidgetFlags.VISIBLE);
+ bool visible = win.get_visible ();
keyfile.set_integer (win.name, "PosX",
winx);
keyfile.set_integer (win.name, "PosY",
winy);
@@ -426,19 +426,26 @@ namespace Xnp {
*/
private void rename_window (Xnp.Window window) {
var dialog = new Gtk.Dialog.with_buttons (_("Rename
group"), window,
+#if ENABLE_GTK3
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+#else
Gtk.DialogFlags.DESTROY_WITH_PARENT|Gtk.DialogFlags.NO_SEPARATOR,
+#endif
Gtk.STOCK_CANCEL,
Gtk.ResponseType.CANCEL, Gtk.STOCK_OK, Gtk.ResponseType.OK);
+ Gtk.Box content_area = (Gtk.Box)dialog.get_content_area
();
dialog.set_default_response (Gtk.ResponseType.OK);
dialog.resizable = false;
dialog.icon_name = Gtk.STOCK_EDIT;
dialog.border_width = 4;
- dialog.vbox.border_width = 6;
+#if !ENABLE_GTK3
+ content_area.border_width = 6;
+#endif
var entry = new Gtk.Entry ();
entry.text = window.name;
entry.activates_default = true;
- dialog.vbox.add (entry);
- dialog.vbox.show_all ();
+ content_area.add (entry);
+ content_area.show_all ();
int res = dialog.run ();
dialog.hide ();
@@ -666,7 +673,7 @@ namespace Xnp {
if (win.is_active) {
active_found = true;
}
- if (!(bool)(win.get_flags () &
Gtk.WidgetFlags.VISIBLE)) {
+ if (!win.get_visible ()) {
invisible_found = true;
}
else {
@@ -677,7 +684,7 @@ namespace Xnp {
foreach (var win in this.window_list) {
// Present visible windows
if (!active_found && visible_found) {
- if ((bool)(win.get_flags () &
Gtk.WidgetFlags.VISIBLE)) {
+ if (win.get_visible ()) {
win.present ();
}
}
@@ -699,7 +706,7 @@ namespace Xnp {
*/
public void open_settings_dialog () {
try {
-
[Xfce4-commits] Include --enable-gtk3 flag in build
Updating branch refs/heads/master to de5772612cb466ee1aebc8ff1021f1f15881 (commit) from 252d53fc7b93587bac17441c500604df524269cc (commit) commit de5772612cb466ee1aebc8ff1021f1f15881 Author: Mike Massonnet Date: Thu Oct 25 03:54:36 2012 +0200 Include --enable-gtk3 flag in build NB: the build with GTK3 will fail currently, and only the xfce4-notes standalone program is being build with GTK+3. configure.ac.in | 29 + lib/Makefile.am | 22 -- src/Makefile.am | 39 +-- 3 files changed, 74 insertions(+), 16 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index a6f83e5..b3c74b6 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -43,21 +43,34 @@ AC_SUBST([MATH_LIBS], [" -lm"]) dnl Check for required packages XDT_CHECK_LIBX11_REQUIRE() XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) -XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0]) + +dnl Check for GTK +AC_ARG_ENABLE([gtk3], + [AC_HELP_STRING([--enable-gtk3], [Build with GTK3])], + [enable_gtk3=$enableval], [enable_gtk3=no]) +if test "x$enable_gtk3" = "xyes"; then +dnl GIO 2.28 for GApplication +XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.28.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0]) +AC_DEFINE([ENABLE_GTK3], [1], [Defined if build with GTK3 is enabled]) +else +XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0]) +fi +AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"]) dnl Check for valac if test "x$USE_MAINTAINER_MODE" = "xyes" ; then - AM_PROG_VALAC([0.16.0]) - if test "x$VALAC" = "x" ; then - AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH]) - fi - XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.10]) +AM_PROG_VALAC([0.16.0]) +if test "x$VALAC" = "x" ; then +AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH]) +fi +XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.10]) fi dnl Translations diff --git a/lib/Makefile.am b/lib/Makefile.am index 48864c3..e65b473 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,10 +7,18 @@ libnotes_la_VALAFLAGS = \ --vapidir=$(top_srcdir)/data/vapi/gtk214\ --pkg=config\ --pkg=color \ - --pkg=gtk+-2.0 \ --pkg=libxfconf-0 \ --pkg=libxfce4util-1.0 +if ENABLE_GTK3 +libnotes_la_VALAFLAGS += \ + -D ENABLE_GTK3 \ + --pkg=gtk+-3.0 +else +libnotes_la_VALAFLAGS += \ + --pkg=gtk+-2.0 +endif + libnotes_la_SOURCES = \ icon-button.vala\ window-monitor.vala \ @@ -18,8 +26,12 @@ libnotes_la_SOURCES = \ hypertextview.vala \ note.vala \ window.vala \ - color.c \ + color.c + +if !ENABLE_GTK3 +libnotes_la_SOURCES += \ popup.c +endif libnotes_la_CFLAGS = \ -DPKGDATADIR=\""$(pkgdatadir)"\"\ @@ -43,3 +55,9 @@ EXTRA_DIST = \ popup.h \ libnotes.vapi \ libnotes.h + +if ENABLE_GTK3 +EXTRA_DIST += \ + popup.c +endif + diff --git a/src/Makefile.am b/src/Makefile.am index b8d3d8b..22c586e 100644 --- a/src/
[Xfce4-commits] Update POTFILES
Updating branch refs/heads/master to e294d32338768bdf9ea2897c407d183f80f6cffa (commit) from d11fe51fae95b5b4963847be76ae4a07409a6076 (commit) commit e294d32338768bdf9ea2897c407d183f80f6cffa Author: Mike Massonnet Date: Wed Oct 24 17:16:08 2012 +0200 Update POTFILES po/POTFILES.in |4 +--- po/POTFILES.skip |2 -- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index f114917..9bd20e4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,6 @@ src/xfce4-notes.desktop.in src/xfce4-notes-autostart.desktop.in -src/xfce4-notes-plugin.desktop.in.in -src/xfce4-notes-plugin-47.desktop.in +src/xfce4-notes-plugin.desktop.in lib/color.c lib/popup.c lib/application.vala @@ -10,7 +9,6 @@ lib/note.vala lib/hypertextview.vala src/xfce4-popup-notes.c src/xfce4-notes-settings.c -src/main-panel-plugin-47.vala src/main-panel-plugin.vala src/xfce-autostart.c src/main-status-icon.vala diff --git a/po/POTFILES.skip b/po/POTFILES.skip index f7b6028..2ed290a 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,7 +2,5 @@ lib/application.c lib/window.c lib/note.c lib/hypertextview.c -src/main-panel-plugin-47.c src/main-panel-plugin.c src/main-status-icon.c -src/xfce4-notes-plugin.desktop.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump dependency to Xfce 4.10
Updating branch refs/heads/master
to d11fe51fae95b5b4963847be76ae4a07409a6076 (commit)
from 7380224d7bd90f085adc9de0a94a9053193324b5 (commit)
commit d11fe51fae95b5b4963847be76ae4a07409a6076
Author: Mike Massonnet
Date: Wed Oct 24 06:07:29 2012 +0200
Bump dependency to Xfce 4.10
Drop support for Xfce <= 4.6.
Replace libxfcegui4 dependency against libxfce4ui.
Update to new libtool syntax (use LT_PREREQ.)
configure.ac.in| 39 +++--
lib/window.vala|1 +
src/Makefile.am| 55 ++--
src/main-panel-plugin-47.vala | 98
src/main-panel-plugin.vala | 60 +---
...47.desktop.in => xfce4-notes-plugin.desktop.in} |0
src/xfce4-notes-plugin.desktop.in.in |8 --
src/xfce4-notes-settings.c |6 +-
8 files changed, 47 insertions(+), 220 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index d59022b..a6f83e5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -19,21 +19,17 @@ AC_INIT([Notes], [xfce4_notes_plugin_version],
[http://bugzilla.xfce.org/], [xfc
AC_REVISION([xfce4_notes_plugin_version_build])
AC_CANONICAL_TARGET()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
AM_INIT_AUTOMAKE([1.11 dist-bzip2])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE()
AM_SILENT_RULES([yes])
-dnl Avoid g77 and g++ checks
-m4_undefine([AC_PROG_CXX])
-m4_defun([AC_PROG_CXX],[])
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-
dnl Check for basic programs
AM_PROG_CC_C_O()
AC_PROG_LD()
-AC_PROG_LIBTOOL()
AC_PROG_INSTALL()
AC_PROG_INTLTOOL()
@@ -46,33 +42,22 @@ AC_SUBST([MATH_LIBS], [" -lm"])
dnl Check for required packages
XDT_CHECK_LIBX11_REQUIRE()
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
-dnl Check for libxfce4panel >= 4.7
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL47], [libxfce4panel-1.0], [4.7.0],
[], [])
-
dnl Check for valac
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
- AM_PROG_VALAC([0.10.0])
+ AM_PROG_VALAC([0.16.0])
if test "x$VALAC" = "x" ; then
AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
fi
- if test "x$LIBXFCE4PANEL47_FOUND" = "xyes" ; then
- XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.7])
- else
- XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.6])
- PKG_CHECK_EXISTS([xfce4-vala >= 4.7],
- AC_ERROR([
- *** Build configured for Xfce Panel 4.6 but ***
- *** Xfce Vala bindings for 4.7 are installed ***]), [])
- fi
+ XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.10])
fi
dnl Translations
diff --git a/lib/window.vala b/lib/window.vala
index 57d7219..dfcd543 100644
--- a/lib/window.vala
+++ b/lib/window.vala
@@ -620,6 +620,7 @@ namespace Xnp {
window.get_geometry (out winx, out winy, out width, out
height, out depth);
window.get_origin (out x, out y);
menu.size_request (out requisition);
+ push_in = false;
if (y + content_box.allocation.y + requisition.height >
Gdk.Screen.height ()) {
/* Show menu above */
diff --git a/src/Makefile.am b/src/Makefile.am
index 09b4c84..b8d3d8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ xfce4_notes_settings_SOURCES =
\
xfce4_notes_settings_CFLAGS = \
@LIBX11_CFLAGS@ \
@GTK_CFLAGS@\
- @LIBXFCEGUI4_CFLAGS@\
+ @LIBXFCE4UI_CFLAGS@ \
@XFCONF_CFLAGS@
[Xfce4-commits] === Release 4.10.2 ===
Updating branch refs/heads/xfce-4.10 to 1be1ba42562b04310f8502ac75f2ce13aaed4d94 (commit) from 424dbd692b326ca15270877e1e03a0be0a17dcbe (commit) commit 1be1ba42562b04310f8502ac75f2ce13aaed4d94 Author: Mike Massonnet Date: Tue Oct 23 03:16:12 2012 +0200 === Release 4.10.2 === ChangeLog |5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a03cf8..19b5cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-10-23 Mike Massonnet +=== Release 4.10.2 === + + +2012-10-23 Mike Massonnet + === Release 4.10.1 === diff --git a/configure.ac.in b/configure.ac.in index a8241d3..8e7beb4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ dnl dnl Version information m4_define([project_version_major], [4]) m4_define([project_version_minor], [10]) -m4_define([project_version_micro], [0]) +m4_define([project_version_micro], [2]) m4_define([project_version_build], [@REVISION@]) m4_define([project_version_tag], []) # leave empty for release m4_define([project_version], [project_version_major().project_version_minor().project_version_micro()project_version_tag()]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-vala-4.10.2
Updating annotated tag refs/tags/xfce4-vala-4.10.2 as new annotated tag to a0d7c318eced4987b198c8c836247b6c53f758e8 (tag) succeeds xfce4-vala-4.10.1 tagged by Mike Massonnet on 2012-10-23 03:21 +0200 Mike Massonnet (1): === Release 4.10.2 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Install garcon-1.deps
Updating branch refs/heads/master to 440fad49c3e30edfe57f70fbe86e08e4beda5619 (commit) from d6fc2384ccf2541e2a000f61a506e71cd11db718 (commit) commit 440fad49c3e30edfe57f70fbe86e08e4beda5619 Author: Mike Massonnet Date: Tue Oct 23 03:04:45 2012 +0200 Install garcon-1.deps Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index eba288d..794013b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ tests.stamp: vapi_DATA =\ vapi/$(LIBXFCE4UTIL).vapi \ vapi/$(GARCON).vapi \ + vapi/$(GARCON).deps \ vapi/$(XFCONF).vapi \ vapi/$(LIBXFCE4UI).vapi \ vapi/$(LIBXFCE4UI).deps \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-vala-4.10.1
Updating annotated tag refs/tags/xfce4-vala-4.10.1 as new annotated tag to 27a0398b28da7d95201f409a9245ee4766d7d0e0 (tag) succeeds xfce4-vala-4.10.0-1-g254fe87 tagged by Mike Massonnet on 2012-10-23 03:06 +0200 Mike Massonnet (1): === Release 4.10.1 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] === Release 4.10.1 ===
Updating branch refs/heads/xfce-4.10 to 424dbd692b326ca15270877e1e03a0be0a17dcbe (commit) from 254fe87154399ccad8a4a9132120149aa22d0a83 (commit) commit 424dbd692b326ca15270877e1e03a0be0a17dcbe Author: Mike Massonnet Date: Tue Oct 23 03:06:02 2012 +0200 === Release 4.10.1 === ChangeLog | 12 +++- NEWS |3 +++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c39d3a2..9a03cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,16 @@ 2012-10-23 Mike Massonnet -=== Release 4.10.0 === +=== Release 4.10.1 === + + +2012-10-23 Mike Massonnet + +Install garcon-1.deps + + +2012-10-23 Mike Massonnet + ++=== Release 4.10.0 === 2012-10-23 Mike Massonnet diff --git a/NEWS b/NEWS index c1dd67d..c167c06 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ ++ Version 4.10.1, 2012-10-23 + +Add missing file in installation. + Version 4.10.0, 2012-10-23 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Install garcon-1.deps
Updating branch refs/heads/xfce-4.10 to 254fe87154399ccad8a4a9132120149aa22d0a83 (commit) from d6fc2384ccf2541e2a000f61a506e71cd11db718 (commit) commit 254fe87154399ccad8a4a9132120149aa22d0a83 Author: Mike Massonnet Date: Tue Oct 23 03:04:45 2012 +0200 Install garcon-1.deps Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index eba288d..794013b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ tests.stamp: vapi_DATA =\ vapi/$(LIBXFCE4UTIL).vapi \ vapi/$(GARCON).vapi \ + vapi/$(GARCON).deps \ vapi/$(XFCONF).vapi \ vapi/$(LIBXFCE4UI).vapi \ vapi/$(LIBXFCE4UI).deps \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch xfce-4.10
Updating branch refs/heads/xfce-4.10 as new branch to 424dbd692b326ca15270877e1e03a0be0a17dcbe (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] Creating annotated tag xfce4-vala-4.10.0
Updating annotated tag refs/tags/xfce4-vala-4.10.0 as new annotated tag to 568ef077c4a058a44a47eb1d39f43a6199873a42 (tag) succeeds xfce4-vala-4.8.0-16-g70f6e22 tagged by Mike Massonnet on 2012-10-23 02:59 +0200 Mike Massonnet (1): +=== Release 4.10.0 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update panel-plugin example
Updating branch refs/heads/master
to 70f6e227b23714c3bf95682e3aa6accd499cde67 (commit)
from 3a9d4e3cdf5719258372d5e9b0f318a69ce4140d (commit)
commit 70f6e227b23714c3bf95682e3aa6accd499cde67
Author: Mike Massonnet
Date: Tue Oct 23 02:53:25 2012 +0200
Update panel-plugin example
examples/panel-plugin/Makefile.am|4 ++--
examples/panel-plugin/build.sh |7 +++
examples/panel-plugin/button.desktop |2 +-
examples/panel-plugin/button.vala| 14 +++---
examples/panel-plugin/configure.ac |2 +-
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/examples/panel-plugin/Makefile.am
b/examples/panel-plugin/Makefile.am
index 0b5125e..3886a16 100644
--- a/examples/panel-plugin/Makefile.am
+++ b/examples/panel-plugin/Makefile.am
@@ -1,12 +1,12 @@
VALAFLAGS = --pkg=gtk+-2.0 --pkg=libxfce4panel-1.0
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
plugin_LTLIBRARIES = libbutton.la
libbutton_la_SOURCES = button.vala
libbutton_la_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
libbutton_la_LIBADD = @LIBXFCE4PANEL_LIBS@
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_DATA = button.desktop
diff --git a/examples/panel-plugin/build.sh b/examples/panel-plugin/build.sh
new file mode 100755
index 000..d0ae458
--- /dev/null
+++ b/examples/panel-plugin/build.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+touch NEWS README AUTHORS ChangeLog
+xdt-autogen
+make
+echo
+echo You can now type make install.
+echo
diff --git a/examples/panel-plugin/button.desktop
b/examples/panel-plugin/button.desktop
index 8cf0b7d..aba324d 100644
--- a/examples/panel-plugin/button.desktop
+++ b/examples/panel-plugin/button.desktop
@@ -2,7 +2,7 @@
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
Name=Button
-Comment=Test plugin for the Xfce 4.7 Panel
+Comment=Test plugin for the Xfce 4.10 Panel
X-XFCE-Unique=true
X-XFCE-Module=button
X-XFCE-Internal=FALSE
diff --git a/examples/panel-plugin/button.vala
b/examples/panel-plugin/button.vala
index e951d63..ccdbbaa 100644
--- a/examples/panel-plugin/button.vala
+++ b/examples/panel-plugin/button.vala
@@ -3,14 +3,6 @@ using Xfce;
public class ButtonPlugin : Xfce.PanelPlugin {
private Gtk.Button button;
- /* The constructor is never called, but since Vala 0.7.8 prints a
warning if the sub-classed
-* class doesn't provide a public constructor and tries to chain up to
it, it is possible to
-* chain directly to Object. This only avoids the warning to be printed.
-*/
- public ButtonPlugin () {
- GLib.Object ();
- }
-
public override void @construct () {
button = new Gtk.Button.with_label ("Hello World!");
add (button);
@@ -18,9 +10,9 @@ public class ButtonPlugin : Xfce.PanelPlugin {
add_action_widget (button);
- save.connect (() => { debug ("save yourself"); });
- free_data.connect (() => { debug ("free yourself"); });
- size_changed.connect (() => { debug ("panel size changed"); });
+ save.connect (() => { message ("save yourself"); });
+ free_data.connect (() => { message ("free yourself"); });
+ size_changed.connect (() => { message ("panel size changed");
return false; });
menu_show_about ();
about.connect (() => {
diff --git a/examples/panel-plugin/configure.ac
b/examples/panel-plugin/configure.ac
index 8845bae..3d2ab88 100644
--- a/examples/panel-plugin/configure.ac
+++ b/examples/panel-plugin/configure.ac
@@ -9,7 +9,7 @@ AC_PROG_INSTALL()
AC_PROG_LIBTOOL()
dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
dnl Check for Vala
AM_PROG_VALAC()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] +=== Release 4.10.0 ===
Updating branch refs/heads/master to d6fc2384ccf2541e2a000f61a506e71cd11db718 (commit) from 70f6e227b23714c3bf95682e3aa6accd499cde67 (commit) commit d6fc2384ccf2541e2a000f61a506e71cd11db718 Author: Mike Massonnet Date: Tue Oct 23 02:55:28 2012 +0200 +=== Release 4.10.0 === ChangeLog | 118 + NEWS |6 +++ 2 files changed, 124 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8c4497..c39d3a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,121 @@ +2012-10-23 Mike Massonnet + +=== Release 4.10.0 === + + +2012-10-23 Mike Massonnet + +Update panel-plugin example + + +2012-10-23 Mike Massonnet + +Add autogenerated file garcon-1.deps to tree + + +2012-10-23 Mike Massonnet + +Update libxfce4panel-1.0 package + +No need for custom VAPI. +Xfce 4.6 macros are excluded. + +2012-10-22 Mike Massonnet + +Update Vapi files + + +2012-10-22 Mike Massonnet + +Update libxfce4util-1.0 package + +Hide Xfce.Stack + +2012-10-22 Mike Massonnet + +Update libxfce4panel-1.0 package + + +2012-10-21 Mike Massonnet + +Update exo-1 package + + +2012-10-21 Mike Massonnet + +Update libxfce4ui-1 package + + +2012-10-21 Mike Massonnet + +Update libxfconf-0 package + + +2012-10-20 Mike Massonnet + +Add small test program for garcon-1 + +Build an applications menu with GTK+. + +2012-10-20 Mike Massonnet + +Update garcon-1 package + +Garcon.Menu.load(cancellable?), cancellable can be null. + +2012-10-20 Mike Massonnet + +Move garcon-1.vapi to /vapi + + +2012-10-20 Mike Massonnet + +Add garcon-1 package + + +2012-10-20 Mike Massonnet + +Update libxfce4util-1.0 package + +Customization + +Xfce.Rc: constructable class +new: xfce_rc_simple_open() +new_from_resource: xfce_rc_config_open() +destroy: xfce_rc_close() +Xfce.Resource: class with static functions +deprecate XfceMatchFunc, match_custom, pop_path, push_path +Xfce.ResourceType.*: XFCE_RESOURCE_TYPE_* enum +Xfce.PosixSignalHandler: class with static functions +Xfce.PosixSignalHandler.Callback: callback for set_handler +function +Xfce.textdomain: xfce_textdomain +convenience function on top of the bindtextdomain and textdomain + functions, all other related functions to +libxfce4util/xfce-i18n.h are deprecated + +Deprecated + +Debug (xfce-debug.h) +Use GLib.debug instead, it prints the line number of the Vala + source file +File Utilities (xfce-fileutils.h) +Xfce.mkdirhier: use GLib.mkdir_with_parents instead +Kiosk Mode (xfce-kiosk.h) +Xfconf provides possibility to lock capabilities (see + perchannel-xml.txt) +Use Xfconf.Channel.is_property_locked instead + +2012-10-17 Mike Massonnet + +Update Vapi files + + +2012-10-17 Mike Massonnet + +Update build to Vala 0.16 + + 2011-02-13 Mike Massonnet === Release 4.8.0 === diff --git a/NEWS b/NEWS index 78c2fcd..c1dd67d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,10 @@ ++ Version 4.10.0, 2012-10-23 + +Added garcon (package, VAPI, and test program). +Updated API to Xfce 4.10.0. +Updated package to Vala 0.16. + + Version 4.8.0, 2011-02-13 Added libxfce4ui. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add autogenerated file garcon-1.deps to tree
Updating branch refs/heads/master
to 3a9d4e3cdf5719258372d5e9b0f318a69ce4140d (commit)
from 7f967db6a037126b98dda2d199b78226b3a27d80 (commit)
commit 3a9d4e3cdf5719258372d5e9b0f318a69ce4140d
Author: Mike Massonnet
Date: Tue Oct 23 02:18:42 2012 +0200
Add autogenerated file garcon-1.deps to tree
{packages/garcon-1 => vapi}/garcon-1.deps |0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/packages/garcon-1/garcon-1.deps b/vapi/garcon-1.deps
similarity index 100%
copy from packages/garcon-1/garcon-1.deps
copy to vapi/garcon-1.deps
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update libxfce4panel-1.0 package
Updating branch refs/heads/master
to 7f967db6a037126b98dda2d199b78226b3a27d80 (commit)
from bac501f2889e311f3651dc9822fd418cd5c780cc (commit)
commit 7f967db6a037126b98dda2d199b78226b3a27d80
Author: Mike Massonnet
Date: Tue Oct 23 02:12:57 2012 +0200
Update libxfce4panel-1.0 package
No need for custom VAPI.
Xfce 4.6 macros are excluded.
Makefile.am|3 +-
.../libxfce4panel-1.0-custom.vala | 17 -
.../libxfce4panel-1.0/libxfce4panel-1.0.excludes |6 +-
packages/libxfce4panel-1.0/libxfce4panel-1.0.gi| 353 +++-
.../libxfce4panel-1.0/libxfce4panel-1.0.metadata | 12 +-
vapi/libxfce4panel-1.0.vapi| 92 +-
6 files changed, 438 insertions(+), 45 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e29ed74..eba288d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ update-vapi:
$(VAPIGEN) --vapidir=. --library $(LIBXFCE4UI)\
../packages/$(LIBXFCE4UI)/$(LIBXFCE4UI).gi;\
$(VAPIGEN) --vapidir=. --library $(LIBXFCE4PANEL)\
- ../packages/$(LIBXFCE4PANEL)/$(LIBXFCE4PANEL).gi\
- ../packages/$(LIBXFCE4PANEL)/$(LIBXFCE4PANEL)-custom.vala;\
+ ../packages/$(LIBXFCE4PANEL)/$(LIBXFCE4PANEL).gi;\
$(VAPIGEN) --vapidir=. --library $(EXO)\
../packages/$(EXO)/$(EXO).gi\
../packages/$(EXO)/$(EXO)-custom.vala;\
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala
b/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala
deleted file mode 100644
index a7e3f25..000
--- a/packages/libxfce4panel-1.0/libxfce4panel-1.0-custom.vala
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Xfce {
- public class PanelImage : Gtk.Widget {
- [CCode (has_construct_function=false)]
- public PanelImage ();
- [CCode (has_construct_function=false)]
- public PanelImage.from_pixbuf (Gdk.Pixbuf pixbuf);
- [CCode (has_construct_function=false)]
- public PanelImage.from_source (string source);
- public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
- public void set_from_source (string source);
- public void clear ();
- }
- public interface PanelPluginProvider {
- }
- public unowned Gtk.Button panel_create_button ();
- public unowned Gtk.ToggleButton panel_create_toggle_button ();
-}
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
b/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
index ffd034d..b58979b 100644
--- a/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.excludes
@@ -1,5 +1 @@
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-deprecated.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h
diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
index 7b1c362..a6f1020 100644
--- a/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
+++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi
@@ -1,6 +1,14 @@
+
+
+
+
+
+
+
+
@@ -27,6 +35,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -53,6 +79,45
[Xfce4-commits] Update Vapi files
Updating branch refs/heads/master
to bac501f2889e311f3651dc9822fd418cd5c780cc (commit)
from 1edddc490fa9f4a81a46369cdd8b2535148ef703 (commit)
commit bac501f2889e311f3651dc9822fd418cd5c780cc
Author: Mike Massonnet
Date: Mon Oct 22 18:15:49 2012 +0200
Update Vapi files
vapi/exo-1.vapi |2 +-
vapi/garcon-1.vapi |2 +-
vapi/libxfce4panel-1.0.vapi |2 +-
vapi/libxfce4ui-1.deps |2 +-
vapi/libxfce4ui-1.vapi |2 +-
vapi/libxfce4util-1.0.vapi | 42 ++
6 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/vapi/exo-1.vapi b/vapi/exo-1.vapi
index 404d3be..159a824 100644
--- a/vapi/exo-1.vapi
+++ b/vapi/exo-1.vapi
@@ -1,4 +1,4 @@
-/* exo-1.vapi generated by vapigen, do not modify. */
+/* exo-1.vapi generated by vapigen-0.16, do not modify. */
namespace Exo {
[CCode (cheader_filename = "exo/exo.h", free_function = "")]
diff --git a/vapi/garcon-1.vapi b/vapi/garcon-1.vapi
index 414f8b5..1ea4814 100644
--- a/vapi/garcon-1.vapi
+++ b/vapi/garcon-1.vapi
@@ -1,4 +1,4 @@
-/* garcon-1.vapi generated by vapigen, do not modify. */
+/* garcon-1.vapi generated by vapigen-0.16, do not modify. */
namespace Garcon {
[CCode (cheader_filename = "garcon/garcon.h")]
diff --git a/vapi/libxfce4panel-1.0.vapi b/vapi/libxfce4panel-1.0.vapi
index f1b349b..b799183 100644
--- a/vapi/libxfce4panel-1.0.vapi
+++ b/vapi/libxfce4panel-1.0.vapi
@@ -1,4 +1,4 @@
-/* libxfce4panel-1.0.vapi generated by vapigen, do not modify. */
+/* libxfce4panel-1.0.vapi generated by vapigen-0.16, do not modify. */
namespace Xfce {
[CCode (cheader_filename = "libxfce4panel/libxfce4panel.h")]
diff --git a/vapi/libxfce4ui-1.deps b/vapi/libxfce4ui-1.deps
index b47d055..ca81f3e 100644
--- a/vapi/libxfce4ui-1.deps
+++ b/vapi/libxfce4ui-1.deps
@@ -1,3 +1,4 @@
+libxfce4util-1.0
atk
gio-2.0
cairo
@@ -5,4 +6,3 @@ pango
gdk-pixbuf-2.0
gdk-2.0
gtk+-2.0
-libxfce4util-1.0
diff --git a/vapi/libxfce4ui-1.vapi b/vapi/libxfce4ui-1.vapi
index 43f7c41..266f8ce 100644
--- a/vapi/libxfce4ui-1.vapi
+++ b/vapi/libxfce4ui-1.vapi
@@ -1,4 +1,4 @@
-/* libxfce4ui-1.vapi generated by vapigen, do not modify. */
+/* libxfce4ui-1.vapi generated by vapigen-0.16, do not modify. */
namespace Xfce {
[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
diff --git a/vapi/libxfce4util-1.0.vapi b/vapi/libxfce4util-1.0.vapi
index 154566d..e56873e 100644
--- a/vapi/libxfce4util-1.0.vapi
+++ b/vapi/libxfce4util-1.0.vapi
@@ -3,13 +3,6 @@
namespace Xfce {
[CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
[Compact]
- public class Kiosk {
- [CCode (has_construct_function = false)]
- public Kiosk (string module);
- public bool query (string capability);
- }
- [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
- [Compact]
public class PosixSignalHandler {
public delegate void Callback (int @signal);
public static bool init () throws GLib.Error;
@@ -59,13 +52,14 @@ namespace Xfce {
public static string[] match (Xfce.ResourceType type, string
pattern, bool unique);
public static unowned string save_location (Xfce.ResourceType
type, string relpath, bool create);
}
- [CCode (cheader_filename = "libxfce4util/libxfce4util.h", cprefix =
"XFCE_LICENSE_TEXT_")]
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h", cprefix =
"XFCE_LICENSE_TEXT_", has_type_id = false)]
public enum LicenseTextType {
BSD,
GPL,
LGPL
}
[CCode (cheader_filename = "libxfce4util/libxfce4util.h", cprefix =
"XFCE_RESOURCE_")]
+ [Compact]
public enum ResourceType {
DATA,
CONFIG,
@@ -74,9 +68,41 @@ namespace Xfce {
THEMES
}
[CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public const int LIBXFCE4UTIL_MAJOR_VERSION;
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public const int LIBXFCE4UTIL_MICRO_VERSION;
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public const int LIBXFCE4UTIL_MINOR_VERSION;
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public static unowned string expand_variables (string command, string
envp);
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public static unowned string get_homedir ();
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
+ public static unowned string get_homefile_r (string buffer, size_t
length, string format);
+ [CCode (cheader_filename
[Xfce4-commits] Update libxfce4util-1.0 package
Updating branch refs/heads/master to 1edddc490fa9f4a81a46369cdd8b2535148ef703 (commit) from d7fa46dbe33073365f7b744712e04e8c62e7afb5 (commit) commit 1edddc490fa9f4a81a46369cdd8b2535148ef703 Author: Mike Massonnet Date: Mon Oct 22 18:15:03 2012 +0200 Update libxfce4util-1.0 package Hide Xfce.Stack packages/libxfce4util-1.0/libxfce4util-1.0.defines |2 +- .../libxfce4util-1.0/libxfce4util-1.0.metadata |2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.defines b/packages/libxfce4util-1.0/libxfce4util-1.0.defines index 16c46cf..6541cb8 100644 --- a/packages/libxfce4util-1.0/libxfce4util-1.0.defines +++ b/packages/libxfce4util-1.0/libxfce4util-1.0.defines @@ -1 +1 @@ --DLIBXFCE4UTIL_COMPILATION -DXFCE_DISABLE_DEPRECATED +-DLIBXFCE4UTIL_COMPILATION diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.metadata b/packages/libxfce4util-1.0/libxfce4util-1.0.metadata index 3af4719..3c64860 100644 --- a/packages/libxfce4util-1.0/libxfce4util-1.0.metadata +++ b/packages/libxfce4util-1.0/libxfce4util-1.0.metadata @@ -3,3 +3,5 @@ Xfce cheader_filename="libxfce4util/libxfce4util.h" xfce_rc_simple_open hidden="1" xfce_rc_config_open hidden="1" xfce_rc_close hidden="1" + +Stack hidden="1" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update libxfce4panel-1.0 package
Updating branch refs/heads/master to d7fa46dbe33073365f7b744712e04e8c62e7afb5 (commit) from 8019cbb996dd8f8f6858c209dafb3bb310c3f227 (commit) commit d7fa46dbe33073365f7b744712e04e8c62e7afb5 Author: Mike Massonnet Date: Mon Oct 22 16:28:52 2012 +0200 Update libxfce4panel-1.0 package .../libxfce4panel-1.0/libxfce4panel-1.0.defines|2 +- packages/libxfce4panel-1.0/libxfce4panel-1.0.gi| 76 ++-- .../libxfce4panel-1.0/libxfce4panel-1.0.metadata |5 +- vapi/libxfce4panel-1.0.vapi| 22 ++- 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines b/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines index 2d37f49..12f281a 100644 --- a/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines +++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.defines @@ -1 +1 @@ --DLIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H -DXFCE_DISABLE_DEPRECATED +-DLIBXFCE4PANEL_COMPILATION diff --git a/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi index 45a1059..7b1c362 100644 --- a/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi +++ b/packages/libxfce4panel-1.0/libxfce4panel-1.0.gi @@ -18,6 +18,15 @@ + + + + + + + + + @@ -39,6 +48,11 @@ + + + + + @@ -201,12 +215,24 @@ + + + + + + + + + + + + @@ -225,12 +251,24 @@ + + + + + + + + + + + + @@ -309,6 +347,20 @@ + + + + + + + + + + + + + + @@ -326,10 +378,14 @@ + + + + @@ -349,6 +405,20
[Xfce4-commits] Update exo-1 package
Updating branch refs/heads/master
to 8019cbb996dd8f8f6858c209dafb3bb310c3f227 (commit)
from 842ab66e440d28121d72247ff4534520d144f21a (commit)
commit 8019cbb996dd8f8f6858c209dafb3bb310c3f227
Author: Mike Massonnet
Date: Sun Oct 21 17:16:54 2012 +0200
Update exo-1 package
packages/exo-1/exo-1-custom.vala |2 +-
packages/exo-1/exo-1.defines |2 +-
packages/exo-1/exo-1.excludes| 32 +++-
packages/exo-1/exo-1.gi | 34 ++
vapi/exo-1.vapi | 19 ++-
5 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/packages/exo-1/exo-1-custom.vala b/packages/exo-1/exo-1-custom.vala
index 796b758..3d986ad 100644
--- a/packages/exo-1/exo-1-custom.vala
+++ b/packages/exo-1/exo-1-custom.vala
@@ -10,7 +10,7 @@ namespace Exo {
public class MutualBinding {
}
- /* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h
exo-gtk-extensions.h exo-pango-extensions.h */
+ /* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h
exo-gtk-extensions.h */
[Compact]
public class Extensions {
public static Gdk.Pixbuf gdk_pixbuf_colorize (Gdk.Pixbuf src,
Gdk.Color color);
diff --git a/packages/exo-1/exo-1.defines b/packages/exo-1/exo-1.defines
index d2d5223..3446cbe 100644
--- a/packages/exo-1/exo-1.defines
+++ b/packages/exo-1/exo-1.defines
@@ -1 +1 @@
--DEXO_INSIDE_EXO_H -DEXO_DISABLE_DEPRECATED
+-DEXO_COMPILATION
diff --git a/packages/exo-1/exo-1.excludes b/packages/exo-1/exo-1.excludes
index 1f6c9c3..55b227a 100644
--- a/packages/exo-1/exo-1.excludes
+++ b/packages/exo-1/exo-1.excludes
@@ -1,9 +1,23 @@
-include/exo-1/exo/exo.h
-include/exo-1/exo/exo-config.h
-include/exo-1/exo/exo-execute.h
-include/exo-1/exo/exo-gdk-pixbuf-extensions.h
-include/exo-1/exo/exo-gobject-extensions.h
-include/exo-1/exo/exo-gtk-extensions.h
-include/exo-1/exo/exo-pango-extensions.h
-include/exo-1/exo/exo-string.h
-include/exo-1/exo/exo-utils.h
+#exo-binding.h
+#exo-cell-renderer-ellipsized-text.h
+#exo-cell-renderer-icon.h
+#exo-config.h
+#exo-enum-types.h
+exo-execute.h
+exo-gdk-pixbuf-extensions.h
+exo-gobject-extensions.h
+exo-gtk-extensions.h
+#exo-icon-bar.h
+#exo-icon-chooser-dialog.h
+#exo-icon-view.h
+#exo-job.h
+#exo-simple-job.h
+exo-string.h
+#exo-toolbars-editor-dialog.h
+#exo-toolbars-editor.h
+#exo-toolbars-model.h
+#exo-toolbars-view.h
+#exo-tree-view.h
+exo-utils.h
+#exo-wrap-table.h
+#exo-xsession-client.h
diff --git a/packages/exo-1/exo-1.gi b/packages/exo-1/exo-1.gi
index 2c4cf9a..0a715be 100644
--- a/packages/exo-1/exo-1.gi
+++ b/packages/exo-1/exo-1.gi
@@ -1,6 +1,14 @@
+
+
+
+
+
+
+
+
@@ -428,6 +436,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -598,6 +620,12 @@
+
+
+
+
+
+
@@ -1615,6 +1643,12 @@
+
+
+
+
+
+
diff --git a/vapi/exo-1.vapi b/vapi/exo-1.vapi
index 5ab766d..404d3be 100644
--- a/vapi/exo-1.vapi
+++ b/vapi/exo-1.vapi
@@ -1,4 +1,4 @@
-/* exo-1.vapi generated by vapigen-0.16, do not modify. */
+/* exo-1.vapi generated by vapigen, do not modify. */
namespace Exo {
[CCode (cheader_filename = "exo/exo.h", free_function = "")]
@@ -104,6 +104,8 @@ namespace Exo {
public void get_drag_dest_item (out unowned Gtk.TreePath path,
Exo.IconViewDropPosition pos);
public bool get_enable_search ();
public bool get_item_at_pos (int x, int y, out unowned
Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
+ public
[Xfce4-commits] Update libxfce4ui-1 package
Updating branch refs/heads/master
to 842ab66e440d28121d72247ff4534520d144f21a (commit)
from 0d4edc991e9c8905627e2241d9f067d590dd94e3 (commit)
commit 842ab66e440d28121d72247ff4534520d144f21a
Author: Mike Massonnet
Date: Sun Oct 21 03:15:09 2012 +0200
Update libxfce4ui-1 package
packages/libxfce4ui-1/libxfce4ui-1.defines |2 +-
packages/libxfce4ui-1/libxfce4ui-1.deps |2 +-
packages/libxfce4ui-1/libxfce4ui-1.excludes |1 -
packages/libxfce4ui-1/libxfce4ui-1.gi | 15 ---
vapi/libxfce4ui-1.vapi |8 +---
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.defines
b/packages/libxfce4ui-1/libxfce4ui-1.defines
index 30dbd62..c2e1547 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.defines
+++ b/packages/libxfce4ui-1/libxfce4ui-1.defines
@@ -1 +1 @@
--DLIBXFCE4UI_INSIDE_LIBXFCE4UI_H -DXFCE_DISABLE_DEPRECATED
+-DLIBXFCE4UI_COMPILATION
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.deps
b/packages/libxfce4ui-1/libxfce4ui-1.deps
index b47d055..ca81f3e 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.deps
+++ b/packages/libxfce4ui-1/libxfce4ui-1.deps
@@ -1,3 +1,4 @@
+libxfce4util-1.0
atk
gio-2.0
cairo
@@ -5,4 +6,3 @@ pango
gdk-pixbuf-2.0
gdk-2.0
gtk+-2.0
-libxfce4util-1.0
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.excludes
b/packages/libxfce4ui-1/libxfce4ui-1.excludes
index b943ec0..e69de29 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.excludes
+++ b/packages/libxfce4ui-1/libxfce4ui-1.excludes
@@ -1 +0,0 @@
-include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
diff --git a/packages/libxfce4ui-1/libxfce4ui-1.gi
b/packages/libxfce4ui-1/libxfce4ui-1.gi
index 296d53d..d1e888c 100644
--- a/packages/libxfce4ui-1/libxfce4ui-1.gi
+++ b/packages/libxfce4ui-1/libxfce4ui-1.gi
@@ -19,6 +19,15 @@
+
+
+
+
+
+
+
+
+
@@ -157,11 +166,11 @@
-
+
-
+
@@ -393,7 +402,7 @@
-
+
diff --git a/vapi/libxfce4ui-1.vapi b/vapi/libxfce4ui-1.vapi
index b06ae28..43f7c41 100644
--- a/vapi/libxfce4ui-1.vapi
+++ b/vapi/libxfce4ui-1.vapi
@@ -1,4 +1,4 @@
-/* libxfce4ui-1.vapi generated by vapigen-0.16, do not modify. */
+/* libxfce4ui-1.vapi generated by vapigen, do not modify. */
namespace Xfce {
[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
@@ -63,12 +63,12 @@ namespace Xfce {
DEFAULT,
LOWEST
}
- [CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix =
"XFCE_SM_CLIENT_RESTART_", has_type_id = false)]
+ [CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix =
"XFCE_SM_CLIENT_RESTART_")]
public enum SMClientRestartStyle {
NORMAL,
IMMEDIATELY
}
- [CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix =
"XFCE_SM_CLIENT_SHUTDOWN_HINT_", has_type_id = false)]
+ [CCode (cheader_filename = "libxfce4ui/libxfce4ui.h", cprefix =
"XFCE_SM_CLIENT_SHUTDOWN_HINT_")]
public enum SMClientShutdownHint {
ASK,
LOGOUT,
@@ -90,6 +90,8 @@ namespace Xfce {
[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
public static void dialog_show_error (Gtk.Window parent, GLib.Error
error, string primary_format);
[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
+ public static void dialog_show_help (Gtk.Window parent, string
application, string page, string offset);
+ [CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
public static void dialog_show_info (Gtk.Window parent, string
secondary_text, string primary_format);
[CCode (cheader_filename = "libxfce4ui/libxfce4ui.h")]
public static void dialog_show_warning (Gtk.Window parent, string
secondary_text, string primary_format);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update libxfconf-0 package
Updating branch refs/heads/master to 0d4edc991e9c8905627e2241d9f067d590dd94e3 (commit) from 1bb4b24802e857acf2f642a6dc8269606024badb (commit) commit 0d4edc991e9c8905627e2241d9f067d590dd94e3 Author: Mike Massonnet Date: Sun Oct 21 02:57:29 2012 +0200 Update libxfconf-0 package packages/libxfconf-0/libxfconf-0.defines |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/libxfconf-0/libxfconf-0.defines b/packages/libxfconf-0/libxfconf-0.defines index 9809814..4e3b992 100644 --- a/packages/libxfconf-0/libxfconf-0.defines +++ b/packages/libxfconf-0/libxfconf-0.defines @@ -1 +1 @@ --DXFCONF_IN_XFCONF_H +-DLIBXFCONF_COMPILATION ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add small test program for garcon-1
Updating branch refs/heads/master
to 1bb4b24802e857acf2f642a6dc8269606024badb (commit)
from dd1689a0b5b1a37476f817564499c7ac9096b2a3 (commit)
commit 1bb4b24802e857acf2f642a6dc8269606024badb
Author: Mike Massonnet
Date: Sat Oct 20 19:16:53 2012 +0200
Add small test program for garcon-1
Build an applications menu with GTK+.
Makefile.am |1 +
tests/garcon-1.vala | 91 +++
2 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0987497..e29ed74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ tests: tests.stamp
tests.stamp:
(cd tests;\
$(VALAC) --pkg=posix --pkg=$(LIBXFCE4UTIL) --vapidir=../vapi
$(LIBXFCE4UTIL).vala;\
+ $(VALAC) --pkg=gtk+-2.0 --pkg=$(GARCON) --vapidir=../vapi
$(GARCON).vala;\
$(VALAC) --pkg=$(XFCONF) --vapidir=../vapi $(XFCONF).vala;\
$(VALAC) --pkg=$(EXO) --vapidir=../vapi $(EXO).vala;\
)
diff --git a/tests/garcon-1.vala b/tests/garcon-1.vala
new file mode 100644
index 000..540cf33
--- /dev/null
+++ b/tests/garcon-1.vala
@@ -0,0 +1,91 @@
+using Gtk;
+using Garcon;
+
+public class ButtonMenu : Gtk.Button {
+
+ private Gtk.Menu menu = null;
+ private Garcon.Menu apps_menu = null;
+
+ construct {
+ this.label = "Show Menu";
+ this.clicked.connect (() => {
+ menu.popup (null, null, null, 0,
Gtk.get_current_event_time ());
+ });
+
+ init_menu ();
+ }
+
+ private void init_menu () {
+
+ /* Build an apps menu */
+ try {
+ apps_menu = new Garcon.Menu.applications ();
+ apps_menu.load (null);
+ } catch (Error ex) {
+ error ("Couldn't load applications menu.");
+ }
+
+ /* Create the gtk menu */
+ menu = new Gtk.Menu ();
+ create_menu_items (menu, apps_menu);
+ menu.show_all ();
+ }
+
+ private void create_menu_items (Gtk.Menu gtk_menu, Garcon.Menu menu) {
+ unowned List items;
+ Gtk.MenuItem mi = null;
+
+ /* Retrieves menu items */
+ items = @menu.get_elements ();
+
+ /* Create gtk menu items */
+ foreach (Garcon.MenuItem item in items) {
+ if (item is Garcon.MenuItem) {
+ mi = new Gtk.MenuItem.with_label (item.get_name
());
+ mi.set_data ("command", item.get_command());
+ mi.activate.connect ((mi) => {
+ message ("execute `%s'",
mi.get_data ("command"));
+ });
+ }
+ else if (item is Garcon.MenuSeparator) {
+ mi = new Gtk.SeparatorMenuItem ();
+ }
+ else if (item is Garcon.Menu) {
+ Garcon.Menu submenu = (Garcon.Menu)item;
+ if (submenu.get_items () == null)
+ continue;
+
+ mi = new Gtk.MenuItem.with_label (item.get_name
());
+
+ Gtk.Menu gtk_submenu = new Gtk.Menu ();
+ create_menu_items (gtk_submenu, submenu);
+ mi.set_submenu (gtk_submenu);
+ }
+ gtk_menu.add (mi);
+ }
+ }
+}
+
+public class GtkSample : Gtk.Window {
+
+ construct {
+ this.title = "Apps Menu";
+ this.destroy.connect (() => { Gtk.main_quit (); });
+
+ var button = new ButtonMenu ();
+ this.add (button);
+ }
+
+ static int main (string[] args) {
+ Gtk.init (ref args);
+ Garcon.set_environment ("XFCE");
+
+ var sample = new GtkSample ();
+ sample.show_all ();
+
+ Gtk.main ();
+
+ return 0;
+ }
+}
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update garcon-1 package
Updating branch refs/heads/master
to dd1689a0b5b1a37476f817564499c7ac9096b2a3 (commit)
from 35b7eeaf00301c0bf2fe6ac327d7b27c6c47ed87 (commit)
commit dd1689a0b5b1a37476f817564499c7ac9096b2a3
Author: Mike Massonnet
Date: Sat Oct 20 19:06:39 2012 +0200
Update garcon-1 package
Garcon.Menu.load(cancellable?), cancellable can be null.
packages/garcon-1/garcon-1.gi |4 ++--
packages/garcon-1/garcon-1.metadata |1 +
vapi/garcon-1.vapi |2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/garcon-1/garcon-1.gi b/packages/garcon-1/garcon-1.gi
index 91e6bc7..1247f33 100644
--- a/packages/garcon-1/garcon-1.gi
+++ b/packages/garcon-1/garcon-1.gi
@@ -1011,8 +1011,8 @@
-
-
+
+
diff --git a/packages/garcon-1/garcon-1.metadata
b/packages/garcon-1/garcon-1.metadata
index 04fc4ad..4158c28 100644
--- a/packages/garcon-1/garcon-1.metadata
+++ b/packages/garcon-1/garcon-1.metadata
@@ -1,3 +1,4 @@
Garcon cheader_filename="garcon/garcon.h"
garcon_menu_item_requires_terminal hidden="1"
garcon_menu_item_supports_startup_notification hidden="1"
+garcon_menu_load.cancellable nullable="1"
diff --git a/vapi/garcon-1.vapi b/vapi/garcon-1.vapi
index 7bd56ed..414f8b5 100644
--- a/vapi/garcon-1.vapi
+++ b/vapi/garcon-1.vapi
@@ -18,7 +18,7 @@ namespace Garcon {
public unowned Garcon.Menu get_menu_with_name (string name);
public unowned GLib.List get_menus ();
public unowned Garcon.Menu get_parent ();
- public bool load (GLib.Cancellable cancellable) throws
GLib.Error;
+ public bool load (GLib.Cancellable? cancellable) throws
GLib.Error;
[NoAccessorMethod]
public Garcon.MenuDirectory directory { owned get; set; }
public GLib.File file { get; construct; }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Move garcon-1.vapi to /vapi
Updating branch refs/heads/master
to 35b7eeaf00301c0bf2fe6ac327d7b27c6c47ed87 (commit)
from bc3005ba7a38ddc939c427955dacbfc3ad2e4c02 (commit)
commit 35b7eeaf00301c0bf2fe6ac327d7b27c6c47ed87
Author: Mike Massonnet
Date: Sat Oct 20 17:46:32 2012 +0200
Move garcon-1.vapi to /vapi
{packages/garcon-1 => vapi}/garcon-1.vapi |0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/packages/garcon-1/garcon-1.vapi b/vapi/garcon-1.vapi
similarity index 100%
rename from packages/garcon-1/garcon-1.vapi
rename to vapi/garcon-1.vapi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add garcon-1 package
Updating branch refs/heads/master to bc3005ba7a38ddc939c427955dacbfc3ad2e4c02 (commit) from dd91cec75a30c8057e1dca8223b14a356e5908f3 (commit) commit bc3005ba7a38ddc939c427955dacbfc3ad2e4c02 Author: Mike Massonnet Date: Sat Oct 20 17:41:18 2012 +0200 Add garcon-1 package Makefile.am |4 + configure.ac.in |3 +- packages/garcon-1/garcon-1.defines |1 + packages/garcon-1/garcon-1.deps |2 + packages/garcon-1/garcon-1.files |2 + packages/garcon-1/garcon-1.gi| 1019 ++ packages/garcon-1/garcon-1.metadata |3 + packages/garcon-1/garcon-1.namespace |1 + packages/garcon-1/garcon-1.vapi | 274 + 9 files changed, 1308 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index fd15d50..0987497 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ NULL = if MAINTAINER_MODE update-gi: $(VALAGI) $(LIBXFCE4UTIL) packages/$(LIBXFCE4UTIL) + $(VALAGI) $(GARCON) packages/$(GARCON) $(VALAGI) $(XFCONF) packages/$(XFCONF) $(VALAGI) $(LIBXFCE4UI) packages/$(LIBXFCE4UI) $(VALAGI) $(LIBXFCE4PANEL) packages/$(LIBXFCE4PANEL) @@ -13,6 +14,8 @@ update-vapi: $(VAPIGEN) --vapidir=. --library $(LIBXFCE4UTIL)\ ../packages/$(LIBXFCE4UTIL)/$(LIBXFCE4UTIL).gi\ ../packages/$(LIBXFCE4UTIL)/$(LIBXFCE4UTIL)-custom.vala;\ + $(VAPIGEN) --vapidir=. --library $(GARCON)\ + ../packages/$(GARCON)/$(GARCON).gi;\ $(VAPIGEN) --vapidir=. --library $(XFCONF)\ ../packages/$(XFCONF)/$(XFCONF).gi\ ../packages/$(XFCONF)/$(XFCONF)-custom.vala;\ @@ -39,6 +42,7 @@ tests.stamp: vapi_DATA =\ vapi/$(LIBXFCE4UTIL).vapi \ + vapi/$(GARCON).vapi \ vapi/$(XFCONF).vapi \ vapi/$(LIBXFCE4UI).vapi \ vapi/$(LIBXFCE4UI).deps \ diff --git a/configure.ac.in b/configure.ac.in index 6503a4a..a8241d3 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,7 +1,7 @@ dnl dnl Xfce4 Vala - Bindings for the Xfce4 framework dnl -dnl Copyright (c) 2009-2011 Mike Massonnet +dnl Copyright (c) 2009-2012 Mike Massonnet dnl dnl Version information @@ -22,6 +22,7 @@ AC_PROG_INSTALL() dnl Check for required packages M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +M8T_CHECK_PACKAGE([GARCON], [garcon-1], [0.2.0]) M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) diff --git a/packages/garcon-1/garcon-1.defines b/packages/garcon-1/garcon-1.defines new file mode 100644 index 000..5d60363 --- /dev/null +++ b/packages/garcon-1/garcon-1.defines @@ -0,0 +1 @@ +-DGARCON_COMPILATION diff --git a/packages/garcon-1/garcon-1.deps b/packages/garcon-1/garcon-1.deps new file mode 100644 index 000..d4db059 --- /dev/null +++ b/packages/garcon-1/garcon-1.deps @@ -0,0 +1,2 @@ +gobject-2.0 +gio-2.0 diff --git a/packages/garcon-1/garcon-1.files b/packages/garcon-1/garcon-1.files new file mode 100644 index 000..c084cf7 --- /dev/null +++ b/packages/garcon-1/garcon-1.files @@ -0,0 +1,2 @@ +include/garcon-1/garcon +lib/libgarcon-1.so diff --git a/packages/garcon-1/garcon-1.gi b/packages/garcon-1/garcon-1.gi new file mode 100644 index 000..91e6bc7 --- /dev/null +++ b/packages/garcon-1/garcon-1.gi @@ -0,0 +1,1019
[Xfce4-commits] Update Vapi files
Updating branch refs/heads/master
to bb2bb424323c0399c9a7f3057c91b86abc7ff81e (commit)
from b1b13aeb6c279221fd5bcaa01810e4364e270079 (commit)
commit bb2bb424323c0399c9a7f3057c91b86abc7ff81e
Author: Mike Massonnet
Date: Wed Oct 17 02:36:12 2012 +0200
Update Vapi files
vapi/exo-1.vapi | 58 +++---
vapi/libxfce4panel-1.0.vapi | 11 +++
vapi/libxfce4ui-1.vapi | 15 +--
vapi/libxfce4util-1.0.vapi | 18 ++---
vapi/libxfconf-0.vapi | 15 +--
5 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/vapi/exo-1.vapi b/vapi/exo-1.vapi
index 5b233d3..5ab766d 100644
--- a/vapi/exo-1.vapi
+++ b/vapi/exo-1.vapi
@@ -1,9 +1,8 @@
-/* exo-1.vapi generated by vapigen-0.10, do not modify. */
+/* exo-1.vapi generated by vapigen-0.16, do not modify. */
-[CCode (cprefix = "Exo", lower_case_cprefix = "exo_")]
namespace Exo {
+ [CCode (cheader_filename = "exo/exo.h", free_function = "")]
[Compact]
- [CCode (free_function = "", cheader_filename = "exo/exo.h")]
public class Binding {
[CCode (has_construct_function = false)]
public Binding (GLib.Object src_object, string src_property,
GLib.Object dst_object, string dst_property);
@@ -15,14 +14,14 @@ namespace Exo {
}
[CCode (cheader_filename = "exo/exo.h")]
public class CellRendererEllipsizedText : Gtk.CellRendererText {
- [CCode (type = "GtkCellRenderer*", has_construct_function =
false)]
+ [CCode (has_construct_function = false, type =
"GtkCellRenderer*")]
public CellRendererEllipsizedText ();
[NoAccessorMethod]
public bool follow_state { get; set; }
}
[CCode (cheader_filename = "exo/exo.h")]
public class CellRendererIcon : Gtk.CellRenderer {
- [CCode (type = "GtkCellRenderer*", has_construct_function =
false)]
+ [CCode (has_construct_function = false, type =
"GtkCellRenderer*")]
public CellRendererIcon ();
[NoAccessorMethod]
public bool follow_state { get; set construct; }
@@ -33,16 +32,16 @@ namespace Exo {
[NoAccessorMethod]
public int size { get; set construct; }
}
- [Compact]
[CCode (cheader_filename = "exo/exo.h")]
+ [Compact]
public class Execute {
public static bool preferred_application (string category,
string? parameter, string working_directory, string[]? envp) throws GLib.Error;
public static bool preferred_application_on_screen (string
category, string? parameter, string working_directory, string[]? envp,
Gdk.Screen screen) throws GLib.Error;
public static bool terminal_shell (string command_line, string?
working_directory, string[]? envp) throws GLib.Error;
public static bool terminal_shell_on_screen (string
command_line, string? working_directory, string[]? envp, Gdk.Screen screen)
throws GLib.Error;
}
- [Compact]
[CCode (cheader_filename = "exo/exo.h")]
+ [Compact]
public class Extensions {
public static bool g_value_transform_negate (GLib.Value
src_value, GLib.Value dst_value);
public static Gdk.Pixbuf gdk_pixbuf_colorize (Gdk.Pixbuf src,
Gdk.Color color);
@@ -58,7 +57,7 @@ namespace Exo {
}
[CCode (cheader_filename = "exo/exo.h")]
public class IconBar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
- [CCode (type = "GtkWidget*", has_construct_function = false)]
+ [CCode (has_construct_function = false, type = "GtkWidget*")]
public IconBar ();
public int get_active ();
public bool get_active_iter (Gtk.TreeIter iter);
@@ -72,7 +71,7 @@ namespace Exo {
public void set_orientation (Gtk.Orientation orientation);
public void set_pixbuf_column (int column);
public void set_text_column (int column);
- [CCode (type = "GtkWidget*", has_construct_function = false)]
+ [CCode (has_construct_function = false, type = "GtkWidget*")]
public IconBar.with_model (Gtk.TreeModel model);
public int active { get; set; }
public Gtk.TreeModel model { get; set; }
@@ -84,14 +83,14 @@ namespace Exo {
}
[CCode (cheader_filename = "exo/exo.h")]
public class IconChooserDialog : Gtk.Dialog, Atk.Implementor,
Gtk.Buildable {
- [CCode (type = "GtkWidget*", has_construct_function = false)]
+ [CCode (has_construct_functi
[Xfce4-commits] Update libxfce4util-1.0 package
Updating branch refs/heads/master
to dd91cec75a30c8057e1dca8223b14a356e5908f3 (commit)
from bb2bb424323c0399c9a7f3057c91b86abc7ff81e (commit)
commit dd91cec75a30c8057e1dca8223b14a356e5908f3
Author: Mike Massonnet
Date: Sat Oct 20 02:26:43 2012 +0200
Update libxfce4util-1.0 package
Customization
Xfce.Rc: constructable class
new: xfce_rc_simple_open()
new_from_resource: xfce_rc_config_open()
destroy: xfce_rc_close()
Xfce.Resource: class with static functions
deprecate XfceMatchFunc, match_custom, pop_path, push_path
Xfce.ResourceType.*: XFCE_RESOURCE_TYPE_* enum
Xfce.PosixSignalHandler: class with static functions
Xfce.PosixSignalHandler.Callback: callback for set_handler
function
Xfce.textdomain: xfce_textdomain
convenience function on top of the bindtextdomain and textdomain
functions, all other related functions to
libxfce4util/xfce-i18n.h are deprecated
Deprecated
Debug (xfce-debug.h)
Use GLib.debug instead, it prints the line number of the Vala
source file
File Utilities (xfce-fileutils.h)
Xfce.mkdirhier: use GLib.mkdir_with_parents instead
Kiosk Mode (xfce-kiosk.h)
Xfconf provides possibility to lock capabilities (see
perchannel-xml.txt)
Use Xfconf.Channel.is_property_locked instead
Makefile.am|2 +-
.../libxfce4util-1.0/libxfce4util-1.0-custom.vala | 10 ++
packages/libxfce4util-1.0/libxfce4util-1.0.defines |2 +-
.../libxfce4util-1.0/libxfce4util-1.0.excludes | 13 ++-
packages/libxfce4util-1.0/libxfce4util-1.0.gi | 114 +++-
tests/libxfce4util-1.0.vala| 15 +---
6 files changed, 108 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9e3086e..fd15d50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
tests: tests.stamp
tests.stamp:
(cd tests;\
- $(VALAC) --pkg=$(LIBXFCE4UTIL) --vapidir=../vapi $(LIBXFCE4UTIL).vala;\
+ $(VALAC) --pkg=posix --pkg=$(LIBXFCE4UTIL) --vapidir=../vapi
$(LIBXFCE4UTIL).vala;\
$(VALAC) --pkg=$(XFCONF) --vapidir=../vapi $(XFCONF).vala;\
$(VALAC) --pkg=$(EXO) --vapidir=../vapi $(EXO).vala;\
)
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
index 61c2712..92158b7 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0-custom.vala
@@ -28,6 +28,16 @@ namespace Xfce {
}
[Compact]
+ [CCode (cheader_filename = "libxfce4util/libxfce4util.h", cprefix =
"XFCE_RESOURCE_")]
+ public enum ResourceType {
+ DATA,
+ CONFIG,
+ CACHE,
+ ICONS,
+ THEMES
+ }
+
+ [Compact]
[CCode (cheader_filename = "libxfce4util/libxfce4util.h")]
public class PosixSignalHandler {
public delegate void Callback (int @signal);
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.defines
b/packages/libxfce4util-1.0/libxfce4util-1.0.defines
index 14a5bfc..16c46cf 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0.defines
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0.defines
@@ -1 +1 @@
--DLIBXFCE4UTIL_INSIDE_LIBXFCE4UTIL_H -DXFCE_DISABLE_DEPRECATED
+-DLIBXFCE4UTIL_COMPILATION -DXFCE_DISABLE_DEPRECATED
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.excludes
b/packages/libxfce4util-1.0/libxfce4util-1.0.excludes
index 18e70d1..fad554d 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0.excludes
+++ b/packages/libxfce4util-1.0/libxfce4util-1.0.excludes
@@ -1,9 +1,12 @@
-include/xfce4/libxfce4util/libxfce4util-config.h
-include/xfce4/libxfce4util/xfce-desktopentry.h
+#include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/xfce-debug.h
include/xfce4/libxfce4util/xfce-fileutils.h
-include/xfce4/libxfce4util/xfce-generics.h
+#include/xfce4/libxfce4util/xfce-generics.h
include/xfce4/libxfce4util/xfce-i18n.h
-include/xfce4/libxfce4util/xfce-miscutils.h
+include/xfce4/libxfce4util/xfce-kiosk.h
+#include/xfce4/libxfce4util/xfce-license.h
+#include/xfce4/libxfce4util/xfce-miscutils.h
include/xfce4/libxfce4util/xfce-posix-signal-handler.h
+#include/xfce4/libxfce4util/xfce-rc.h
include/xfce4/libxfce4util/xfce-resource.h
-include/xfce4/libxfce4util/xfce-utf8.h
+#include/xfce4/libxfce4util/xfce-utf8.h
diff --git a/packages/libxfce4util-1.0/libxfce4util-1.0.gi
b/packages/libxfce4util-1.0/libxfce4util-1.0.gi
index 9c30525..e8dc738 100644
--- a/packages/libxfce4util-1.0/libxfce4util-1.0.gi
+++ b/packages/libxfce4util-1.0/libx
[Xfce4-commits] Update build to Vala 0.16
Updating branch refs/heads/master
to b1b13aeb6c279221fd5bcaa01810e4364e270079 (commit)
from 8aab7e76b1acc2f6090622d829637fee7c0607dc (commit)
commit b1b13aeb6c279221fd5bcaa01810e4364e270079
Author: Mike Massonnet
Date: Wed Oct 17 02:12:09 2012 +0200
Update build to Vala 0.16
acinclude.m4| 14 +++---
autogen.sh | 21 +
configure.ac.in | 16
3 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index d1208ce..b47cb49 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 >= $3], [],
dnl # M8T_CHECK_VALA(minimum_version)
dnl #
-dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
+dnl # Check for the package vala-0.16 and substitutes useful Vala variables.
dnl #
AC_DEFUN([M8T_CHECK_VALA],
[
-PKG_CHECK_MODULES([VALA], [vala-0.10 >= $1])
+PKG_CHECK_MODULES([VALA], [libvala-0.16 >= $1])
M8T_VALA_PROGS()
M8T_VAPI_DIR()
])
dnl # M8T_VALA_PROGS()
dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.16 pkgconfig file.
dnl #
AC_DEFUN([M8T_VALA_PROGS],
[
AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.16`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16`)
])
dnl # M8T_VAPI_DIR()
dnl #
-dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
+dnl # Substitutes vapidir from vala-0.16 pkgconfig file.
dnl #
AC_DEFUN([M8T_VAPI_DIR],
[
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.16`)
])
diff --git a/autogen.sh b/autogen.sh
index f6165e2..3bb92fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,4 @@
#!/bin/sh
-#
-# Copyright (c) 2002-2005
-# The Xfce development team. All rights reserved.
-#
-# Written for Xfce by Benedikt Meurer .
-#
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <configure.ac
-echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
-echo >>configure.ac
-
-# substitute revision
-if [ -d .git ]; then
-revision=$(git log -1 --pretty=format:%h 2>&1 || echo NOHEAD)
-else
-revision=UNKNOWN
-fi
-sed -e "s/@REVISION@/${revision}/g" \
-< "configure.ac.in" >> "configure.ac"
-
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 4b78025..6503a4a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl
dnl Version information
m4_define([project_version_major], [4])
-m4_define([project_version_minor], [8])
+m4_define([project_version_minor], [10])
m4_define([project_version_micro], [0])
m4_define([project_version_build], [@REVISION@])
m4_define([project_version_tag], []) # leave empty for release
@@ -21,21 +21,21 @@ dnl Check for basic programs
AC_PROG_INSTALL()
dnl Check for required packages
-M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
-M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
+M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.10.0])
+M8T_CHECK_VALA([0.16.0])
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
[],
[with_default_vapidir=no])
if test x"$with_default_vapidir" == xno ; then
- AC_SUBST([vapidir], [${datarootdir}/vala-0.10/vapi])
+ AC_SUBST([vapidir], [${datarootdir}/vala-0.16/vapi])
fi
dnl Makefile outputs
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] playlist: Set position of song optional (bug 9271)
Updating branch refs/heads/master
to dba1cef1f3d10ff13cd73732969a7f2ef49892af (commit)
from 3aef3fc78d5a7d43c8cb77bc0cbfb1cab822ae05 (commit)
commit dba1cef1f3d10ff13cd73732969a7f2ef49892af
Author: Mike Massonnet
Date: Wed Sep 12 22:23:00 2012 +0200
playlist: Set position of song optional (bug 9271)
New preference "playlist-show-position" which is currently a hidden option
and set
by default to false. The position of the track is not very important.
src/playlist.vala| 20
src/preferences.vala |6 ++
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/playlist.vala b/src/playlist.vala
index adf20f9..1ed9a5e 100644
--- a/src/playlist.vala
+++ b/src/playlist.vala
@@ -75,18 +75,22 @@ namespace Xfmpc {
var cell = new Gtk.CellRendererText ();
cell.xalign = 1;
- this.treeview.insert_column_with_attributes (-1,
"Length", cell,
-"text",
Columns.COLUMN_POSITION,
-"weight",
Columns.COLUMN_WEIGHT,
-null);
+ var column = new Gtk.TreeViewColumn.with_attributes
("Position", cell,
+
"text", Columns.COLUMN_POSITION,
+
"weight", Columns.COLUMN_WEIGHT,
+
null);
+ column.visible =
this.preferences.playlist_show_position;
+ this.treeview.append_column (column);
+
cell = new Gtk.CellRendererText ();
cell.ellipsize = Pango.EllipsizeMode.END;
- var column = new Gtk.TreeViewColumn.with_attributes
("Song", cell,
-
"text", Columns.COLUMN_SONG,
-
"weight", Columns.COLUMN_WEIGHT,
-
null);
+ column = new Gtk.TreeViewColumn.with_attributes
("Song", cell,
+
"text", Columns.COLUMN_SONG,
+
"weight", Columns.COLUMN_WEIGHT,
+null);
column.expand = true;
this.treeview.append_column (column);
+
cell = new Gtk.CellRendererText ();
cell.xalign = 1;
this.treeview.insert_column_with_attributes (-1,
"Length", cell,
diff --git a/src/preferences.vala b/src/preferences.vala
index 1656e75..2c6cc74 100644
--- a/src/preferences.vala
+++ b/src/preferences.vala
@@ -66,6 +66,11 @@ namespace Xfmpc {
get { return _playlist_autocenter; }
set { _playlist_autocenter = value; store (); }
}
+ private bool _playlist_show_position;
+ public bool playlist_show_position {
+ get { return _playlist_show_position; }
+ set { _playlist_show_position = value; store (); }
+ }
private string _mpd_hostname;
public string mpd_hostname {
get { return _mpd_hostname; }
@@ -114,6 +119,7 @@ namespace Xfmpc {
_last_window_height = 330;
_last_window_state_sticky = false;
_playlist_autocenter = true;
+ _playlist_show_position = false;
_mpd_hostname = "localhost";
_mpd_port = 6600;
_mpd_password = "";
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] getinvolved: Drop link to register a developper account
Updating branch refs/heads/master to fbdcd209a340cbaf225a205a6e9d0d89bf7e5908 (commit) from aa21e5b13710b99562fc7c5c3fc24f1e44518f49 (commit) commit fbdcd209a340cbaf225a205a6e9d0d89bf7e5908 Author: Mike Massonnet Date: Fri Aug 24 20:07:00 2012 +0200 getinvolved: Drop link to register a developper account The link throwed too many useless requests, obviously. pages/getinvolved/index.php |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php index 89a5c65..fc2a7ad 100644 --- a/pages/getinvolved/index.php +++ b/pages/getinvolved/index.php @@ -24,7 +24,6 @@ - https://releases.xfce.org/login/request";> ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use new libtool syntax (see bug #6920)
Updating branch refs/heads/master to 1f86f8565d836072a1f2c5e4305094a9f0a27a99 (commit) from 81e0d4ae6f64b67dfcba31650d79628176ef3448 (commit) commit 1f86f8565d836072a1f2c5e4305094a9f0a27a99 Author: Mike Massonnet Date: Mon Jul 30 21:43:16 2012 +0200 Use new libtool syntax (see bug #6920) configure.in.in |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 16c0659..af808c5 100644 --- a/configure.in.in +++ b/configure.in.in @@ -38,11 +38,16 @@ dnl *** Check for basic programs *** dnl AC_PROG_CC() AM_PROG_CC_C_O() -AC_PROG_LIBTOOL() AC_PROG_LD() AC_PROG_INSTALL() AC_PROG_INTLTOOL() +dnl ** +dnl *** Initialize libtool *** +dnl ** +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl ** dnl *** Check for standard headers *** dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922)
Updating branch refs/heads/master
to 06b68094e4283f45d3254366d847056b9041d7a0 (commit)
from 1f86f8565d836072a1f2c5e4305094a9f0a27a99 (commit)
commit 06b68094e4283f45d3254366d847056b9041d7a0
Author: Mike Massonnet
Date: Mon Jul 30 21:45:23 2012 +0200
Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922)
src/extended-interface.vala |2 +-
src/playlist.vala |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/extended-interface.vala b/src/extended-interface.vala
index 5fa3a0a..3787b93 100644
--- a/src/extended-interface.vala
+++ b/src/extended-interface.vala
@@ -197,7 +197,7 @@ namespace Xfmpc {
this.context_menu.show_all ();
}
- private void menu_detach (Widget attach_widget, Menu menu) {
+ private void menu_detach (Gtk.Widget attach_widget, Gtk.Menu
menu) {
}
/*
diff --git a/src/playlist.vala b/src/playlist.vala
index 924431b..adf20f9 100644
--- a/src/playlist.vala
+++ b/src/playlist.vala
@@ -98,7 +98,7 @@ namespace Xfmpc {
new
Gtk.Adjustment (0, 0, 0, 0, 0, 0));
scrolled.set_policy (Gtk.PolicyType.AUTOMATIC,
Gtk.PolicyType.ALWAYS);
- this.menu = new Menu ();
+ this.menu = new Gtk.Menu ();
var mi = new Gtk.ImageMenuItem.from_stock
(Gtk.Stock.REMOVE, null);
this.menu.append (mi);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] getinvolved: Add link to request a developper account.
Updating branch refs/heads/master to b40518e8a395d9e5ed616b8faf97d898f9f2d205 (commit) from e88738a5e08ff141ef5a0572bf9d3ec6fe9e91bd (commit) commit b40518e8a395d9e5ed616b8faf97d898f9f2d205 Author: Mike Massonnet Date: Sun Jul 15 22:05:13 2012 +0200 getinvolved: Add link to request a developper account. pages/getinvolved/index.php |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php index fc2a7ad..89a5c65 100644 --- a/pages/getinvolved/index.php +++ b/pages/getinvolved/index.php @@ -24,6 +24,7 @@ + https://releases.xfce.org/login/request";> ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag version-1.2.0
Updating annotated tag refs/tags/version-1.2.0 as new annotated tag to d0606db04b4fae6a6ad11105ae79479cbf7f7f40 (tag) succeeds version-1.1.0-49-ga73a304 tagged by Mike Massonnet on 2012-07-15 18:08 +0200 Mike Massonnet (1): Release 1.2.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix first startup when no configuration file exist
Updating branch refs/heads/master to a73a3041bc576ca1c8f5bfadfe6393d899a0c83f (commit) from d4afbebbb0bbc9e03052fc35049d2ecf70e28266 (commit) commit a73a3041bc576ca1c8f5bfadfe6393d899a0c83f Author: Mike Massonnet Date: Sun Jul 15 17:18:54 2012 +0200 Fix first startup when no configuration file exist The plugin was invisible because it failed to open the RC file. panel-plugin/netload.c |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c index 42117c2..95811df 100644 --- a/panel-plugin/netload.c +++ b/panel-plugin/netload.c @@ -421,7 +421,6 @@ static t_global_monitor * monitor_new(XfcePanelPlugin *plugin) gtk_widget_set_has_tooltip(global->ebox, TRUE); g_signal_connect(global->ebox, "query-tooltip", G_CALLBACK(tooltip_cb), global); gtk_widget_show(global->ebox); -global->box = NULL; global->tooltip_text = gtk_label_new(NULL); g_object_ref(global->tooltip_text); @@ -592,10 +591,10 @@ static void monitor_read_config(XfcePanelPlugin *plugin, t_global_monitor *globa char *file; XfceRc *rc; -if (!(file = xfce_panel_plugin_lookup_rc_file (plugin))) +if (!(file = xfce_panel_plugin_save_location (plugin, TRUE))) return; -rc = xfce_rc_simple_open (file, TRUE); +rc = xfce_rc_simple_open (file, FALSE); g_free (file); if (!rc) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Release 1.2.0
Updating branch refs/heads/master to 487341708b5afeaf392a5eb9f058be9146a080ba (commit) from a73a3041bc576ca1c8f5bfadfe6393d899a0c83f (commit) commit 487341708b5afeaf392a5eb9f058be9146a080ba Author: Mike Massonnet Date: Sun Jul 15 17:20:41 2012 +0200 Release 1.2.0 NEWS | 11 +++ icons/Makefile.am |3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index bcab65e..97df195 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +1.2.0 += +- Some code cleanup and respect the Panel HIG +- Update monitor labels sizes gracefully, bug #8842 +- Rectify tooltip information, bug #9089 +- Support new panel mode Deskbar, bug #8941 +- Drop if_ppp headers, bug #7481 +- Reorganize code in monitor_new, setup_monitor and monitor_set_orientation, bug #8917 +- Keep colorized values after orientation change, bug #8915 +- Fix widget visibility on orientation change, bug #8914 + 1.1.0 = - Add option to show values in panel in addition to the bars, bug #7804 diff --git a/icons/Makefile.am b/icons/Makefile.am index 4d6d234..97a43de 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -13,3 +13,6 @@ install-data-hook: echo "***"; \ fi +uninstall-local: + -rm $(datadir)/icons/hicolor/icon-theme.cache + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix compilation warnings
Updating branch refs/heads/master
to d4afbebbb0bbc9e03052fc35049d2ecf70e28266 (commit)
from 1b785ff83a091c06cdc26c662c669f1b4a738080 (commit)
commit d4afbebbb0bbc9e03052fc35049d2ecf70e28266
Author: Mike Massonnet
Date: Sun Jul 15 16:43:49 2012 +0200
Fix compilation warnings
panel-plugin/monitor-label.c |4 ++--
panel-plugin/netload.c |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/monitor-label.c b/panel-plugin/monitor-label.c
index 0e0d409..99c4d23 100644
--- a/panel-plugin/monitor-label.c
+++ b/panel-plugin/monitor-label.c
@@ -106,7 +106,7 @@ cb_label_changed (GObject *object, GParamSpec *pspec,
gpointer user_data)
label->count_height++;
}
-gtk_widget_set_size_request (label, req.width, req.height);
+gtk_widget_set_size_request (widget, req.width, req.height);
}
@@ -132,6 +132,6 @@ xnlp_monitor_label_reinit_size_request (XnlpMonitorLabel
*label)
label->width = 0;
label->height = 0;
-gtk_widget_set_size_request (label, -1, -1);
+gtk_widget_set_size_request (GTK_WIDGET (label), -1, -1);
}
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index 015ff06..42117c2 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -416,8 +416,8 @@ static t_global_monitor * monitor_new(XfcePanelPlugin
*plugin)
global = g_new(t_global_monitor, 1);
global->timeout_id = 0;
global->ebox = gtk_event_box_new();
-gtk_event_box_set_visible_window(global->ebox, FALSE);
-gtk_event_box_set_above_child(global->ebox, TRUE);
+gtk_event_box_set_visible_window(GTK_EVENT_BOX(global->ebox), FALSE);
+gtk_event_box_set_above_child(GTK_EVENT_BOX(global->ebox), TRUE);
gtk_widget_set_has_tooltip(global->ebox, TRUE);
g_signal_connect(global->ebox, "query-tooltip", G_CALLBACK(tooltip_cb),
global);
gtk_widget_show(global->ebox);
@@ -501,7 +501,7 @@ static void setup_monitor(t_global_monitor *global,
gboolean supress_warnings)
/* Show title label? */
if (global->monitor->options.use_label)
{
-gtk_label_set_text(global->monitor->label,
global->monitor->options.label_text);
+gtk_label_set_text(GTK_LABEL(global->monitor->label),
global->monitor->options.label_text);
gtk_widget_show(global->monitor->label);
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix msgfmt errors.
Updating branch refs/heads/master to 1b785ff83a091c06cdc26c662c669f1b4a738080 (commit) from dbafafb04445f461d367a4c9ea54675bde26469c (commit) commit 1b785ff83a091c06cdc26c662c669f1b4a738080 Author: Mike Massonnet Date: Sun Jul 15 16:08:14 2012 +0200 Fix msgfmt errors. po/nl.po |2 +- po/pt.po |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index e24009d..46ea7d0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -40,7 +40,7 @@ msgid "<< %s >> (Interface down)" msgstr "<< %s >> (Netwerkkaart staat uit)" #: ../panel-plugin/netload.c:249 -#, c-format +#, fuzzy, c-format msgid "" "<< %s >> (%s)\n" "Average of last %d measures\n" diff --git a/po/pt.po b/po/pt.po index 4558e6b..c7ada8a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -38,7 +38,7 @@ msgid "<< %s >> (Interface down)" msgstr "<< %s >> (Interface desligada)" #: ../panel-plugin/netload.c:249 -#, c-format +#, fuzzy, c-format msgid "" "<< %s >> (%s)\n" "Average of last %d measures\n" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bug 8842: Update monitor labels sizes gracefully
Updating branch refs/heads/master
to dd0c73ff94c9697760831a13f0d12cbb33f5cabf (commit)
from 005d94bf49ff66fca30c35d1ce8ee79fe63a2788 (commit)
commit dd0c73ff94c9697760831a13f0d12cbb33f5cabf
Author: Mike Massonnet
Date: Sun Jul 15 14:30:51 2012 +0200
Bug 8842: Update monitor labels sizes gracefully
New label class XnlpMonitorLabel that sets the requisition size
dynamically, in order to avoid flickering in the panel.
This class is only useful for labels that change periodically.
When the 10 last changes requested a smaller size than the actual
it will adapt to this new size.
panel-plugin/Makefile.am | 14 +++--
panel-plugin/monitor-label.c | 137 ++
panel-plugin/monitor-label.h | 36 +++
panel-plugin/netload.c | 16 ++---
4 files changed, 187 insertions(+), 16 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 2163277..92e1d26 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,13 +5,15 @@ LIBS = @LIBS@ @SOLLIBS@
xfce4_netload_plugin_SOURCES = \
netload.c \
- utils.c \
- utils.h \
+ monitor-label.c \
+ monitor-label.h \
+ utils.c \
+ utils.h \
net.h \
- net.c \
- os.h\
- wormulon.h \
- global.h\
+ net.c \
+ os.h\
+ wormulon.h \
+ global.h\
slurm.h
xfce4_netload_plugin_CFLAGS = \
diff --git a/panel-plugin/monitor-label.c b/panel-plugin/monitor-label.c
new file mode 100644
index 000..0e0d409
--- /dev/null
+++ b/panel-plugin/monitor-label.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2012 Mike Massonnet
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * See the file COPYING for the full license text.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include
+#endif
+
+#include
+
+#include "monitor-label.h"
+
+
+
+typedef struct _XnlpMonitorLabelClass XnlpMonitorLabelClass;
+struct _XnlpMonitorLabelClass
+{
+GtkLabelClass parent_class;
+};
+struct _XnlpMonitorLabel
+{
+GtkLabelparent;
+/**/
+gintcount_width;
+gintcount_height;
+gintwidth;
+gintheight;
+};
+
+G_DEFINE_TYPE (XnlpMonitorLabel, xnlp_monitor_label, GTK_TYPE_LABEL)
+
+static void xnlp_monitor_label_constructed (GObject *object);
+
+static void cb_label_changed(GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data);
+
+
+
+static void
+xnlp_monitor_label_class_init (XnlpMonitorLabelClass *klass)
+{
+GObjectClass *class = G_OBJECT_CLASS (klass);
+xnlp_monitor_label_parent_class = g_type_class_peek_parent (klass);
+}
+
+static void
+xnlp_monitor_label_init (XnlpMonitorLabel *label)
+{
+label->count_width = 0;
+label->count_height = 0;
+label->width = 0;
+label->height = 0;
+
+g_signal_connect (label, "notify::label", G_CALLBACK
(cb_label_changed), NULL);
+}
+
+
+
+static void
+cb_label_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
+{
+XnlpMonitorLabel *label = XNLP_MONITOR_LABEL (object);
+GtkWidget *widget = GTK_WIDGET (object);
+GtkRequisition req;
+
+gtk_widget_set_size_request (widget, -1, -1);
+gtk_widget_size_request (widget, &req);
+
+if (req.width >= label->width)
+{
+label->width = req.width;
+label->count_width = 0;
+}
+else if (label->count_width > 10
[Xfce4-commits] Use 2px padding around labels
Updating branch refs/heads/master
to 005d94bf49ff66fca30c35d1ce8ee79fe63a2788 (commit)
from f53356bea9f13fe373ca203674f3aa19f5736d53 (commit)
commit 005d94bf49ff66fca30c35d1ce8ee79fe63a2788
Author: Mike Massonnet
Date: Sun Jul 15 10:10:03 2012 +0200
Use 2px padding around labels
panel-plugin/netload.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index 6fd3f67..20480b0 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -466,14 +466,14 @@ static t_global_monitor * monitor_new(XfcePanelPlugin
*plugin)
global->monitor->label =
gtk_label_new(global->monitor->options.label_text);
gtk_box_pack_start(GTK_BOX(global->box),
GTK_WIDGET(global->monitor->label),
- TRUE, FALSE, BORDER / 2);
+ TRUE, FALSE, 2);
/* Create sent and received labels */
global->monitor->rcv_label = gtk_label_new("-");
global->monitor->sent_label = gtk_label_new("-");
gtk_box_pack_start(GTK_BOX(global->box),
GTK_WIDGET(global->monitor->rcv_label),
- TRUE, FALSE, BORDER / 2);
+ TRUE, FALSE, 2);
/* Create the progress bars */
for (i = 0; i < SUM; i++)
@@ -486,7 +486,7 @@ static t_global_monitor * monitor_new(XfcePanelPlugin
*plugin)
/* Append sent label after the progress bars */
gtk_box_pack_start(GTK_BOX(global->box),
GTK_WIDGET(global->monitor->sent_label),
- TRUE, FALSE, BORDER / 2);
+ TRUE, FALSE, 2);
gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to f306502cdc022fe177270a2fd1bcb44424454905 (commit) from 9638ba5685c501e5666df0d65b4ad5d29ba0fefb (commit) commit f306502cdc022fe177270a2fd1bcb44424454905 Author: Mike Massonnet Date: Sat Jul 14 21:10:09 2012 +0200 l10n: Updated French (fr) translation to 100% po/fr.po | 64 +++-- 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/po/fr.po b/po/fr.po index 83f0b51..34fdc81 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,33 +3,33 @@ # This file is distributed under the same license as the xfce4-netload-plugin package. # Stephane Roy , 2005. # Maximilian Schleiss , 2007. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-netload-plugin 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-08 15:01+\n" +"POT-Creation-Date: 2012-07-14 21:08+0200\n" "PO-Revision-Date: 2007-01-05 10:34+0100\n" "Last-Translator: Maximilian Schleiss \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -#: ../panel-plugin/netload.c:59 +#: ../panel-plugin/netload.c:60 msgid "Xfce4-Netload-Plugin" msgstr "Xfce4-Netload-Plugin" -#: ../panel-plugin/netload.c:62 +#: ../panel-plugin/netload.c:63 msgid "Unknown error." msgstr "Erreur inconnue." -#: ../panel-plugin/netload.c:63 +#: ../panel-plugin/netload.c:64 msgid "Linux proc device '/proc/net/dev' not found." msgstr "Fichier '/proc/net/dev' non trouvé." -#: ../panel-plugin/netload.c:64 +#: ../panel-plugin/netload.c:65 msgid "Interface was not found." msgstr "Interface non trouvée." @@ -42,22 +42,24 @@ msgstr "<< %s >> (interface inactive)" #, c-format msgid "" "<< %s >> (%s)\n" -"Average of last %d measures:\n" -"Incoming: %s/s\n" -"Outgoing: %s/s\n" -"Total: %s/s" +"Average of last %d measures\n" +"with an interval of %.2fs:\n" +"Incoming: %s\n" +"Outgoing: %s\n" +"Total: %s" msgstr "" "<< %s >> (%s)\n" -"Moyenne des %d dernières mesures :\n" +"Moyenne des %d dernières mesures\n" +"avec un intervalle de %.2fs :\n" "Entrant : %s/s\n" "Sortant : %s/s\n" "Total : %s/s" -#: ../panel-plugin/netload.c:251 +#: ../panel-plugin/netload.c:252 msgid "no IP address" msgstr "pas d'adresse IP" -#: ../panel-plugin/netload.c:533 +#: ../panel-plugin/netload.c:572 #, c-format msgid "" "%s: Error in initializing:\n" @@ -66,71 +68,71 @@ msgstr "" "%s : Erreur durant l'initialisation :\n" "%s" -#: ../panel-plugin/netload.c:872 +#: ../panel-plugin/netload.c:887 msgid "Select color" msgstr "Sélectionner une couleur" -#: ../panel-plugin/netload.c:938 +#: ../panel-plugin/netload.c:953 msgid "Bar color (i_ncoming):" msgstr "Couleur de la barre (_entrant) :" -#: ../panel-plugin/netload.c:939 +#: ../panel-plugin/netload.c:954 msgid "Bar color (_outgoing):" msgstr "Couleur de la barre (_sortant) :" -#: ../panel-plugin/netload.c:942 +#: ../panel-plugin/netload.c:957 msgid "Maximum (inco_ming):" msgstr "Maximum (e_ntrant) :" -#: ../panel-plugin/netload.c:943 +#: ../panel-plugin/netload.c:958 msgid "Maximum (o_utgoing):" msgstr "Maximum (s_ortant) :" -#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 +#: ../panel-plugin/netload.c:963 ../panel-plugin/netload.desktop.in.in.h:1 msgid "Network Monitor" msgstr "Moniteur réseau" -#: ../panel-plugin/netload.c:977 +#: ../panel-plugin/netload.c:992 msgid "_Text to display:" msgstr "_Texte à afficher :" -#: ../panel-plugin/netload.c:1008 +#: ../panel-plugin/netload.c:1023 msgid "Network _device:" msgstr "_Périphérique réseau :" -#: ../panel-plugin/netload.c:1036 +#: ../panel-plugin/netload.c:1051 msgid "Update _interval:" msgstr "_Intervalle de mise à jour :" -#: ../panel-plugin/netload.c:1049 +#: ../panel-plugin/netload.c:1064 msgid "s" msgstr "s" -#: ../panel-plugin/netload.c:1062 +#: ../panel-plugin/netload.c:1077 msgid "_Automatic maximum" msgstr "_Maximum automatique" -#: ../panel-plugin/netload.c:1096 +#: ../panel-plugin/netload.c: msgid "KiB/s" msgstr "Ko/s" -#: ../panel-plugin/netload.c:1121 +#: ../panel-plugin/netload.c:1136 msgid "_Present data as:" msgstr "P_résenter les données :" -#: ../panel-plugin/netload.c:1130 +#: ../panel-plugin/netload.c:1145 msgid "Bars" msgstr "Barres" -#: ../panel-plugin/netload.c:1131 +#: ../panel-plugin/netload.c:1146 msgid "Values" msgstr "Valeurs" -#: ../panel-plugin/netload.c:1132 +#: ../panel-plugin/netload.c:1147 msgid "Bars and values" msgstr "Barres et valeurs" -#: ../panel-plugin/netload.c:1182 +#: ../panel-plugin/netload.c:1197 msgid "_Colorize values" msgstr "_Colorer les valeurs" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Revert "l10n: Updated French (fr) translation to 100%"
Updating branch refs/heads/master to 9638ba5685c501e5666df0d65b4ad5d29ba0fefb (commit) from 2b6d72d14f84e46e4ffd6c6bd0e2a7968db9e500 (commit) commit 9638ba5685c501e5666df0d65b4ad5d29ba0fefb Author: Mike Massonnet Date: Sat Jul 14 21:07:58 2012 +0200 Revert "l10n: Updated French (fr) translation to 100%" This reverts commit 2b6d72d14f84e46e4ffd6c6bd0e2a7968db9e500. Online edition did not put changes in the PO file. po/fr.po | 57 - 1 files changed, 28 insertions(+), 29 deletions(-) diff --git a/po/fr.po b/po/fr.po index c0ceb5c..83f0b51 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-netload-plugin 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-14 19:03+\n" +"POT-Creation-Date: 2012-01-08 15:01+\n" "PO-Revision-Date: 2007-01-05 10:34+0100\n" "Last-Translator: Maximilian Schleiss \n" "Language-Team: French \n" @@ -17,19 +17,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -#: ../panel-plugin/netload.c:60 +#: ../panel-plugin/netload.c:59 msgid "Xfce4-Netload-Plugin" msgstr "Xfce4-Netload-Plugin" -#: ../panel-plugin/netload.c:63 +#: ../panel-plugin/netload.c:62 msgid "Unknown error." msgstr "Erreur inconnue." -#: ../panel-plugin/netload.c:64 +#: ../panel-plugin/netload.c:63 msgid "Linux proc device '/proc/net/dev' not found." msgstr "Fichier '/proc/net/dev' non trouvé." -#: ../panel-plugin/netload.c:65 +#: ../panel-plugin/netload.c:64 msgid "Interface was not found." msgstr "Interface non trouvée." @@ -42,11 +42,10 @@ msgstr "<< %s >> (interface inactive)" #, c-format msgid "" "<< %s >> (%s)\n" -"Average of last %d measures\n" -"with an interval of %.2fs:\n" -"Incoming: %s\n" -"Outgoing: %s\n" -"Total: %s" +"Average of last %d measures:\n" +"Incoming: %s/s\n" +"Outgoing: %s/s\n" +"Total: %s/s" msgstr "" "<< %s >> (%s)\n" "Moyenne des %d dernières mesures :\n" @@ -54,11 +53,11 @@ msgstr "" "Sortant : %s/s\n" "Total : %s/s" -#: ../panel-plugin/netload.c:252 +#: ../panel-plugin/netload.c:251 msgid "no IP address" msgstr "pas d'adresse IP" -#: ../panel-plugin/netload.c:572 +#: ../panel-plugin/netload.c:533 #, c-format msgid "" "%s: Error in initializing:\n" @@ -67,71 +66,71 @@ msgstr "" "%s : Erreur durant l'initialisation :\n" "%s" -#: ../panel-plugin/netload.c:887 +#: ../panel-plugin/netload.c:872 msgid "Select color" msgstr "Sélectionner une couleur" -#: ../panel-plugin/netload.c:953 +#: ../panel-plugin/netload.c:938 msgid "Bar color (i_ncoming):" msgstr "Couleur de la barre (_entrant) :" -#: ../panel-plugin/netload.c:954 +#: ../panel-plugin/netload.c:939 msgid "Bar color (_outgoing):" msgstr "Couleur de la barre (_sortant) :" -#: ../panel-plugin/netload.c:957 +#: ../panel-plugin/netload.c:942 msgid "Maximum (inco_ming):" msgstr "Maximum (e_ntrant) :" -#: ../panel-plugin/netload.c:958 +#: ../panel-plugin/netload.c:943 msgid "Maximum (o_utgoing):" msgstr "Maximum (s_ortant) :" -#: ../panel-plugin/netload.c:963 ../panel-plugin/netload.desktop.in.in.h:1 +#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 msgid "Network Monitor" msgstr "Moniteur réseau" -#: ../panel-plugin/netload.c:992 +#: ../panel-plugin/netload.c:977 msgid "_Text to display:" msgstr "_Texte à afficher :" -#: ../panel-plugin/netload.c:1023 +#: ../panel-plugin/netload.c:1008 msgid "Network _device:" msgstr "_Périphérique réseau :" -#: ../panel-plugin/netload.c:1051 +#: ../panel-plugin/netload.c:1036 msgid "Update _interval:" msgstr "_Intervalle de mise à jour :" -#: ../panel-plugin/netload.c:1064 +#: ../panel-plugin/netload.c:1049 msgid "s" msgstr "s" -#: ../panel-plugin/netload.c:1077 +#: ../panel-plugin/netload.c:1062 msgid "_Automatic maximum" msgstr "_Maximum automatique" -#: ../panel-plugin/netload.c: +#: ../panel-plugin/netload.c:1096 msgid "KiB/s" msgstr "Ko/s" -#: ../panel-plugin/netload.c:1136 +#: ../panel-plugin/netload.c:1121 msgid "_Present data as:" msgstr "P_résenter les données :" -#: ../panel-plugin/netload.c:1145 +#: ../panel-plugin/netload.c:1130 msgid "Bars" msgstr "Barres" -#: ../panel-plugin/netload.c:1146 +#: ../panel-plugin/netload.c:1131 msgid "Values" msgstr "Valeurs" -#: ../panel-plugin/netload.c:1147 +#: ../panel-plugin/netload.c:1132 msgid "Bars and values" msgstr "Barres et valeurs" -#: ../panel-plugin/netload.c:1197 +#: ../panel-plugin/netload.c:1182 msgid "_Colorize values" msgstr "_Colorer les valeurs" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bug 9089: Rectify tooltip information
Updating branch refs/heads/master
to 0e7c2b2b11dfcee5c2c34796b7ce5a04eea2dc9c (commit)
from 7434a7f1fbb4c35c92add675d5a0314cacda8671 (commit)
commit 0e7c2b2b11dfcee5c2c34796b7ce5a04eea2dc9c
Author: Mike Massonnet
Date: Sat Jul 14 19:52:58 2012 +0200
Bug 9089: Rectify tooltip information
The exchanged data is not always per second, therefore
the code now displays the interval and values in bytes.
panel-plugin/netload.c |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index e85cd9f..6fd3f67 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -246,10 +246,12 @@ static gboolean update_monitors(t_global_monitor *global)
{
char* ip = get_ip_address(&(global->monitor->data));
g_snprintf(caption, sizeof(caption),
-_("<< %s >> (%s)\nAverage of last %d measures:\n"
-"Incoming: %s/s\nOutgoing: %s/s\nTotal: %s/s"),
+ _("<< %s >> (%s)\nAverage of last %d measures\n"
+ "with an interval of %.2fs:\n"
+ "Incoming: %s\nOutgoing: %s\nTotal: %s"),
get_name(&(global->monitor->data)), ip ? ip : _("no IP
address"),
-HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
+HISTSIZE_CALCULATE,
global->monitor->options.update_interval / 1000.0,
+buffer[IN], buffer[OUT], buffer[TOT]);
gtk_label_set_text(GTK_LABEL(global->tooltip_text), caption);
if (global->monitor->options.show_values)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bug 8941: Support new panel mode Deskbar
Updating branch refs/heads/master
to 7434a7f1fbb4c35c92add675d5a0314cacda8671 (commit)
from 1d664b83161e5d22c98a576d45e0e4a4da439773 (commit)
commit 7434a7f1fbb4c35c92add675d5a0314cacda8671
Author: Mike Massonnet
Date: Sat Jul 14 18:31:31 2012 +0200
Bug 8941: Support new panel mode Deskbar
Bumped dependency to Xfce Panel 4.9, and replaced Orientation code
against Mode.
Properly support three modes Horizontal, Vertical, and Deskbar by
respecting the Panel HIG. Fixes also bug 8959, code sets 1px border
width for very small panels, 2px otherwise.
Use pixel fixed width (60px) instead of width_chars for labels, because
in vertical mode the size is incorrect.
Fix 9073, custom colors wasn't working for the progress bars, this has
been fixed while rearranging the code.
configure.ac.in|6 +-
panel-plugin/netload.c | 143 ++--
2 files changed, 93 insertions(+), 56 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 5b4c212..4800e6f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl Copyright 2003 Benedikt Meurer
dnl Copyright 2010 Florian Rivoal
dnl
-m4_define([netload_version],[1.1.0])
+m4_define([netload_version],[1.2.0])
AC_INIT([xfce4-netload-plugin], [netload_version],
[goodies-...@xfce.org])
@@ -53,10 +53,10 @@ AC_CHECK_LIB(nsl, kstat_open, SOLLIBS="$SOLLIBS
-linet_ntop", SOLLIBS="$SOLLIBS"
AC_SUBST(SOLLIBS)
dnl configure the panel plugin
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.9.0])
dnl configure the libxfcegui4
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
dnl Check for i18n support
XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index d64e7bc..e85cd9f 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -35,6 +35,7 @@
#define BORDER 8
+#define LABEL_SIZE 60
/* Defaults */
#define DEFAULT_TEXT "Net"
@@ -283,38 +284,100 @@ static void run_update (t_global_monitor *global)
/*
--
*/
-static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation
orientation,
- t_global_monitor *global)
+static gboolean monitor_set_size(XfcePanelPlugin *plugin, int size,
t_global_monitor *global)
{
gint i;
+XfcePanelPluginMode mode = xfce_panel_plugin_get_mode (plugin);
+
+PRINT_DBG("monitor_set_size");
+
+if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+{
+for (i = 0; i < SUM; i++)
+
gtk_widget_set_size_request(GTK_WIDGET(global->monitor->status[i]), BORDER,
BORDER);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->rcv_label),
-1, -1);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->sent_label),
-1, -1);
+gtk_widget_set_size_request(GTK_WIDGET(plugin), size, -1);
+}
+else if (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL)
+{
+for (i = 0; i < SUM; i++)
+
gtk_widget_set_size_request(GTK_WIDGET(global->monitor->status[i]), -1, BORDER);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->rcv_label),
-1, LABEL_SIZE);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->sent_label),
-1, LABEL_SIZE);
+gtk_widget_set_size_request(GTK_WIDGET(plugin), size, -1);
+}
+else /* mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL */
+{
+for (i = 0; i < SUM; i++)
+
gtk_widget_set_size_request(GTK_WIDGET(global->monitor->status[i]), BORDER, -1);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->rcv_label),
LABEL_SIZE, -1);
+gtk_widget_set_size_request(GTK_WIDGET(global->monitor->sent_label),
LABEL_SIZE, -1);
+gtk_widget_set_size_request(GTK_WIDGET(plugin), -1, size);
+}
+
+gtk_container_set_border_width(GTK_CONTAINER(global->box), size > 26 ? 2 :
1);
+
+return TRUE;
+}
+
+
+/*
--
*/
+static void monitor_set_mode (XfcePanelPlugin *plugin, XfcePanelPluginMode
mode,
+ t_global_monitor *global)
+{
+gint i;
+
+PRINT_DBG("monitor_set_mode");
if (global->timeout_id)
{
g_source_remove(global->timeout_id);
}
-xfce_hvbox_set_orientation(XFCE_HVBOX(global->box), orientation);
-if (orientation == GTK_ORIENTATION_HORIZONTAL)
+if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
{
-gtk_misc_set_alignment(GTK_MISC(global->monitor->rcv_label), 1.0f,
0.5f);
-
[Xfce4-commits] Bug 7481: Drop if_ppp headers
Updating branch refs/heads/master to 1d664b83161e5d22c98a576d45e0e4a4da439773 (commit) from 863b40eddaf096d3473bc567ccd0f7b9eec89ac5 (commit) commit 1d664b83161e5d22c98a576d45e0e4a4da439773 Author: Mike Massonnet Date: Fri Jul 13 13:13:35 2012 +0200 Bug 7481: Drop if_ppp headers The code included net/if_ppp.h headers, but the code doesn't use any function from this header. FreeBSD doesn't ship if_ppp.h anymore and it broke compilation. panel-plugin/os.h | 10 -- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/panel-plugin/os.h b/panel-plugin/os.h index 5731580..473c2a4 100644 --- a/panel-plugin/os.h +++ b/panel-plugin/os.h @@ -98,8 +98,6 @@ # include # include # include -# include -# include #elif __FreeBSD__ || __FreeBSD_kernel__ /* F R E E B S D */ # include # include @@ -122,8 +120,6 @@ # include # include # include -# include -# include #elif __NetBSD__/* N E T B S D */ # include # include @@ -147,8 +143,6 @@ # include # include # include -# include -# include # include #elif __OpenBSD__ || __MicroBSD__ /* O P E N B S D */ # include @@ -173,8 +167,6 @@ # include # include # include -# include -# include #elif __linux__ /* L I N U X */ # include # include @@ -195,8 +187,6 @@ # include # include # include -# include -# include #elif __Solaris__ /* S O L A R I S */ # include # define _WIDEC_H ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix comment in setup_monitor
Updating branch refs/heads/master
to 80826ee11e479f7fefb050f9481d43f1b3d86796 (commit)
from 1fef9b7e93e83049acab49e9c6badc912e9387eb (commit)
commit 80826ee11e479f7fefb050f9481d43f1b3d86796
Author: Mike Massonnet
Date: Fri Jun 1 17:09:07 2012 +0200
Fix comment in setup_monitor
panel-plugin/netload.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index d1eea63..d64e7bc 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -486,7 +486,7 @@ static void setup_monitor(t_global_monitor *global,
gboolean supress_warnings)
gtk_widget_modify_fg(global->monitor->sent_label, GTK_STATE_NORMAL,
NULL);
}
-/* Create the progress bars */
+/* Setup the progress bars */
for (i = 0; i < SUM; i++)
{
if (global->monitor->options.show_bars)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
