[Xfce4-commits] moka:master Work with groups
Updating branch refs/heads/master to 242349706a3feaaf1cf7b1325a3a5d919b3ceabe (commit) from 59f901ac83018554ce079db642192b122b8d1ed1 (commit) commit 242349706a3feaaf1cf7b1325a3a5d919b3ceabe Author: Nick Schermer n...@xfce.org Date: Mon Mar 3 21:08:42 2014 +0100 Work with groups lib/helpers/gitolite.rb | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/helpers/gitolite.rb b/lib/helpers/gitolite.rb index cee2e97..39bdc34 100644 --- a/lib/helpers/gitolite.rb +++ b/lib/helpers/gitolite.rb @@ -48,13 +48,13 @@ module Moka next unless project.groups.include?(repo) maintainers = projects[name] - + group_name = @ + name.capitalize + -DEVS if maintainers +conf group_name + = + maintainers.sort.join( ) conf repo + classification.name + / + name -conf \n\tRW = + maintainers.sort.join( ) -conf \n\tRWCD USER/ = + maintainers.sort.join( ) -conf \n\tC refs/tags/ = + maintainers.sort.join( ) - +conf \n\tRW = + group_name +conf \n\tRWCD USER/ = + group_name +conf \n\tC refs/tags/ = + group_name conf \n\n end end ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gitolite-admin:master Automated update.
Updating branch refs/heads/master to 2ff8de63ded0c9223eaff9ee2e99682f7c581c70 (commit) from b47c0c3dba9d69ec5f931b0fee356e91becd7633 (commit) commit 2ff8de63ded0c9223eaff9ee2e99682f7c581c70 Author: Nick Schermer n...@xfce.org Date: Mon Mar 3 21:10:19 2014 +0100 Automated update. conf/gitolite.conf | 988 ++-- 1 file changed, 494 insertions(+), 494 deletions(-) diff --git a/conf/gitolite.conf b/conf/gitolite.conf index 7c8dcf6..15d7653 100644 --- a/conf/gitolite.conf +++ b/conf/gitolite.conf @@ -36,498 +36,498 @@ repo @all # End of prefix file -repo apps/airconfig - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo apps/eatmonkey - RW = mmassonnet - RWCD USER/ = mmassonnet - C refs/tags/ = mmassonnet - -repo apps/gigolo - RW = enrico nick - RWCD USER/ = enrico nick - C refs/tags/ = enrico nick - -repo apps/mousepad - RW = mbrush nick - RWCD USER/ = mbrush nick - C refs/tags/ = mbrush nick - -repo apps/orage - RW = juha - RWCD USER/ = juha - C refs/tags/ = juha - -repo apps/parole - RW = bluesabre mbrush ochosi - RWCD USER/ = bluesabre mbrush ochosi - C refs/tags/ = bluesabre mbrush ochosi - -repo apps/ristretto - RW = stephan - RWCD USER/ = stephan - C refs/tags/ = stephan - -repo apps/squeeze - RW = peter stephan - RWCD USER/ = peter stephan - C refs/tags/ = peter stephan - -repo apps/transd - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo apps/xfbib - RW = tssj zarper - RWCD USER/ = tssj zarper - C refs/tags/ = tssj zarper - -repo apps/xfburn - RW = mmassonnet squisher - RWCD USER/ = mmassonnet squisher - C refs/tags/ = mmassonnet squisher - -repo apps/xfce4-dict - RW = enrico - RWCD USER/ = enrico - C refs/tags/ = enrico - -repo apps/xfce4-mixer - RW = andrzejr gber jannis jeromeg nick - RWCD USER/ = andrzejr gber jannis jeromeg nick - C refs/tags/ = andrzejr gber jannis jeromeg nick - -repo apps/xfce4-notifyd - RW = jeromeg kelnos nick ochosi - RWCD USER/ = jeromeg kelnos nick ochosi - C refs/tags/ = jeromeg kelnos nick ochosi - -repo apps/xfce4-screenshooter - RW = jeromeg - RWCD USER/ = jeromeg - C refs/tags/ = jeromeg - -repo apps/xfce4-taskmanager - RW = landry mmassonnet nick timystery - RWCD USER/ = landry mmassonnet nick timystery - C refs/tags/ = landry mmassonnet nick timystery - -repo apps/xfce4-terminal - RW = nick - RWCD USER/ = nick - C refs/tags/ = nick - -repo apps/xfce4-volstatus-icon - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo apps/xfmpc - RW = mmassonnet - RWCD USER/ = mmassonnet - C refs/tags/ = mmassonnet - -repo apps/xfvnc - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo archive/xfmedia - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo art/xfce4-icon-theme - RW = stephan - RWCD USER/ = stephan - C refs/tags/ = stephan - -repo art/xfwm4-themes - RW = nick olivier - RWCD USER/ = nick olivier - C refs/tags/ = nick olivier - -repo bindings/glib-objc - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo bindings/pyxfce - RW = ender - RWCD USER/ = ender - C refs/tags/ = ender - -repo bindings/xfc - RW = bl - RWCD USER/ = bl - C refs/tags/ = bl - -repo bindings/xfce4-perl - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo bindings/xfce4-vala - RW = mmassonnet - RWCD USER/ = mmassonnet - C refs/tags/ = mmassonnet - -repo foundation/cafe - RW = jannis - RWCD USER/ = jannis - C refs/tags/ = jannis - -repo foundation/documents - RW = jannis - RWCD USER/ = jannis - C refs/tags/ = jannis - -repo libs/ghal - RW = kelnos - RWCD USER/ = kelnos - C refs/tags/ = kelnos - -repo panel-plugins/xfce4-battery-plugin - RW = andrzejr landry mmassonnet - RWCD USER/ = andrzejr landry mmassonnet - C refs/tags/ = andrzejr landry mmassonnet - -repo panel-plugins/xfce4-calculator-plugin - RW = edelmann - RWCD USER/ = edelmann - C refs/tags/ = edelmann - -repo panel-plugins/xfce4-clipman-plugin - RW = mmassonnet
[Xfce4-commits] moka:master Fix previous commit.
Updating branch refs/heads/master to 8219aa7cfebdf285ecb20f5b065700c10c72c08c (commit) from 242349706a3feaaf1cf7b1325a3a5d919b3ceabe (commit) commit 8219aa7cfebdf285ecb20f5b065700c10c72c08c Author: Nick Schermer n...@xfce.org Date: Mon Mar 3 21:12:31 2014 +0100 Fix previous commit. lib/helpers/gitolite.rb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/helpers/gitolite.rb b/lib/helpers/gitolite.rb index 39bdc34..22aee7e 100644 --- a/lib/helpers/gitolite.rb +++ b/lib/helpers/gitolite.rb @@ -48,10 +48,10 @@ module Moka next unless project.groups.include?(repo) maintainers = projects[name] - group_name = @ + name.capitalize + -DEVS + group_name = @ + name.upcase + -DEVS if maintainers conf group_name + = + maintainers.sort.join( ) -conf repo + classification.name + / + name +conf \nrepo + classification.name + / + name conf \n\tRW = + group_name conf \n\tRWCD USER/ = + group_name conf \n\tC refs/tags/ = + group_name ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gitolite-admin:master Automated update.
Updating branch refs/heads/master to 030c41d3c0f558939aa2c9b8af09c153054b36be (commit) from 2ff8de63ded0c9223eaff9ee2e99682f7c581c70 (commit) commit 030c41d3c0f558939aa2c9b8af09c153054b36be Author: Nick Schermer n...@xfce.org Date: Mon Mar 3 21:13:12 2014 +0100 Automated update. conf/gitolite.conf | 1087 1 file changed, 593 insertions(+), 494 deletions(-) diff --git a/conf/gitolite.conf b/conf/gitolite.conf index 15d7653..a72a6cd 100644 --- a/conf/gitolite.conf +++ b/conf/gitolite.conf @@ -36,498 +36,597 @@ repo @all # End of prefix file -@Airconfig-DEVS = kelnosrepo apps/airconfig - RW = @Airconfig-DEVS - RWCD USER/ = @Airconfig-DEVS - C refs/tags/ = @Airconfig-DEVS - -@Eatmonkey-DEVS = mmassonnetrepo apps/eatmonkey - RW = @Eatmonkey-DEVS - RWCD USER/ = @Eatmonkey-DEVS - C refs/tags/ = @Eatmonkey-DEVS - -@Gigolo-DEVS = enrico nickrepo apps/gigolo - RW = @Gigolo-DEVS - RWCD USER/ = @Gigolo-DEVS - C refs/tags/ = @Gigolo-DEVS - -@Mousepad-DEVS = mbrush nickrepo apps/mousepad - RW = @Mousepad-DEVS - RWCD USER/ = @Mousepad-DEVS - C refs/tags/ = @Mousepad-DEVS - -@Orage-DEVS = juharepo apps/orage - RW = @Orage-DEVS - RWCD USER/ = @Orage-DEVS - C refs/tags/ = @Orage-DEVS - -@Parole-DEVS = bluesabre mbrush ochosirepo apps/parole - RW = @Parole-DEVS - RWCD USER/ = @Parole-DEVS - C refs/tags/ = @Parole-DEVS - -@Ristretto-DEVS = stephanrepo apps/ristretto - RW = @Ristretto-DEVS - RWCD USER/ = @Ristretto-DEVS - C refs/tags/ = @Ristretto-DEVS - -@Squeeze-DEVS = peter stephanrepo apps/squeeze - RW = @Squeeze-DEVS - RWCD USER/ = @Squeeze-DEVS - C refs/tags/ = @Squeeze-DEVS - -@Transd-DEVS = kelnosrepo apps/transd - RW = @Transd-DEVS - RWCD USER/ = @Transd-DEVS - C refs/tags/ = @Transd-DEVS - -@Xfbib-DEVS = tssj zarperrepo apps/xfbib - RW = @Xfbib-DEVS - RWCD USER/ = @Xfbib-DEVS - C refs/tags/ = @Xfbib-DEVS - -@Xfburn-DEVS = mmassonnet squisherrepo apps/xfburn - RW = @Xfburn-DEVS - RWCD USER/ = @Xfburn-DEVS - C refs/tags/ = @Xfburn-DEVS - -@Xfce4-dict-DEVS = enricorepo apps/xfce4-dict - RW = @Xfce4-dict-DEVS - RWCD USER/ = @Xfce4-dict-DEVS - C refs/tags/ = @Xfce4-dict-DEVS - -@Xfce4-mixer-DEVS = andrzejr gber jannis jeromeg nickrepo apps/xfce4-mixer - RW = @Xfce4-mixer-DEVS - RWCD USER/ = @Xfce4-mixer-DEVS - C refs/tags/ = @Xfce4-mixer-DEVS - -@Xfce4-notifyd-DEVS = jeromeg kelnos nick ochosirepo apps/xfce4-notifyd - RW = @Xfce4-notifyd-DEVS - RWCD USER/ = @Xfce4-notifyd-DEVS - C refs/tags/ = @Xfce4-notifyd-DEVS - -@Xfce4-screenshooter-DEVS = jeromegrepo apps/xfce4-screenshooter - RW = @Xfce4-screenshooter-DEVS - RWCD USER/ = @Xfce4-screenshooter-DEVS - C refs/tags/ = @Xfce4-screenshooter-DEVS - -@Xfce4-taskmanager-DEVS = landry mmassonnet nick timysteryrepo apps/xfce4-taskmanager - RW = @Xfce4-taskmanager-DEVS - RWCD USER/ = @Xfce4-taskmanager-DEVS - C refs/tags/ = @Xfce4-taskmanager-DEVS - -@Xfce4-terminal-DEVS = nickrepo apps/xfce4-terminal - RW = @Xfce4-terminal-DEVS - RWCD USER/ = @Xfce4-terminal-DEVS - C refs/tags/ = @Xfce4-terminal-DEVS - -@Xfce4-volstatus-icon-DEVS = kelnosrepo apps/xfce4-volstatus-icon - RW = @Xfce4-volstatus-icon-DEVS - RWCD USER/ = @Xfce4-volstatus-icon-DEVS - C refs/tags/ = @Xfce4-volstatus-icon-DEVS - -@Xfmpc-DEVS = mmassonnetrepo apps/xfmpc - RW = @Xfmpc-DEVS - RWCD USER/ = @Xfmpc-DEVS - C refs/tags/ = @Xfmpc-DEVS - -@Xfvnc-DEVS = kelnosrepo apps/xfvnc - RW = @Xfvnc-DEVS - RWCD USER/ = @Xfvnc-DEVS - C refs/tags/ = @Xfvnc-DEVS - -@Xfmedia-DEVS = kelnosrepo archive/xfmedia - RW = @Xfmedia-DEVS - RWCD USER/ = @Xfmedia-DEVS - C refs/tags/ = @Xfmedia-DEVS - -@Xfce4-icon-theme-DEVS = stephanrepo art/xfce4-icon-theme - RW = @Xfce4-icon-theme-DEVS - RWCD USER/ = @Xfce4-icon-theme-DEVS - C refs/tags/ = @Xfce4-icon-theme-DEVS - -@Xfwm4-themes-DEVS = nick olivierrepo art/xfwm4-themes - RW = @Xfwm4-themes-DEVS - RWCD USER/ = @Xfwm4-themes-DEVS - C refs/tags/ = @Xfwm4-themes-DEVS - -@Glib-objc-DEVS = kelnosrepo bindings/glib-objc - RW = @Glib-objc-DEVS - RWCD USER/ = @Glib-objc-DEVS - C refs/tags/ = @Glib-objc-DEVS - -@Pyxfce-DEVS = enderrepo bindings/pyxfce - RW = @Pyxfce-DEVS - RWCD USER/ = @Pyxfce-DEVS - C refs/tags/ = @Pyxfce-DEVS - -@Xfc-DEVS = blrepo bindings/xfc - RW
[Xfce4-commits] docs:master Test3
Updating branch refs/heads/master to 87731917109aa277ac5b933f0e33cf0a4221e8c4 (commit) from a516e8d853005e919d2b9f743657e0f29d108b62 (commit) commit 87731917109aa277ac5b933f0e33cf0a4221e8c4 Author: Nick Schermer n...@xfce.org Date: Wed Feb 26 22:27:49 2014 +0100 Test3 test |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 9daeafb..df6b0d2 100644 --- a/test +++ b/test @@ -1 +1 @@ -test +test3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] moka:master Force clone urls.
Updating branch refs/heads/master
to 14eef080f407b2d9bf8f644683d5b6aa655daf6e (commit)
from 67d536be55f0aff50b60e037e6c660bd7d1a6663 (commit)
commit 14eef080f407b2d9bf8f644683d5b6aa655daf6e
Author: Nick Schermer n...@xfce.org
Date: Mon Feb 24 22:13:41 2014 +0100
Force clone urls.
lib/helpers/cgit.rb |1 +
1 file changed, 1 insertion(+)
diff --git a/lib/helpers/cgit.rb b/lib/helpers/cgit.rb
index f9a2ab2..97eea9d 100644
--- a/lib/helpers/cgit.rb
+++ b/lib/helpers/cgit.rb
@@ -30,6 +30,7 @@ module Moka
sect repo.url=#{classification.name}/#{project.name}\n
sect repo.name=#{project.name}\n
+sect
repo.clone-url=git://git.xfce.org/#{classification.name}/#{project.name}
ssh://g...@git.xfce.org/#{classification.name}/#{project.name}\n
sect repo.path=#{path}\n
sect repo.desc=#{project.shortdesc}\n
sect repo.owner=#{project.owner}\n unless
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Add some fancy cairo-drawing if the compositor is in use FIXME: add theming possibilities for roundness, colors, border-width and alpha
Updating branch refs/heads/master
to 413bccdc0f58cf3f7259b5b0e9c714b922ea3696 (commit)
from 57249e54924c8a22d74a927e888cef621f13f434 (commit)
commit 413bccdc0f58cf3f7259b5b0e9c714b922ea3696
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Jul 11 10:53:33 2013 +0200
Add some fancy cairo-drawing if the compositor is in use
FIXME: add theming possibilities for roundness, colors, border-width and
alpha
src/tabwin.c | 50 ++
1 file changed, 50 insertions(+)
diff --git a/src/tabwin.c b/src/tabwin.c
index 3111fb0..ad949df 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -96,6 +96,44 @@ get_color (GtkWidget *win, GtkStateType state_type)
}
static gboolean
+tabwin_expose (GtkWidget *tbw, GdkEventExpose *event, gpointer data)
+{
+GtkWindow *window;
+GdkScreen *screen;
+cairo_t *cr;
+gint radius = 10.0;
+double degrees = 3.14 / 180.0;
+double width = tbw-allocation.width;
+double height = tbw-allocation.height;
+
+window = GTK_WINDOW(tbw);
+screen = gtk_window_get_screen(window);
+
+cr = gdk_cairo_create (tbw-window);
+cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+gdk_cairo_region(cr, event-region);
+cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
+cairo_fill_preserve(cr);
+cairo_clip(cr);
+cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+
+//Draw a filled rounded rectangle with an outline
+cairo_set_line_width (cr, 1.0);
+cairo_arc (cr, width - radius - 0.5, radius + 0.5, radius, -90 * degrees,
0 * degrees);
+cairo_arc (cr, width - radius - 0.5, height - radius - 0.5, radius, 0 *
degrees, 90 * degrees);
+cairo_arc (cr, radius + 0.5, height - radius - 0.5, radius, 90 * degrees,
180 * degrees);
+cairo_arc (cr, radius + 0.5, radius + 0.5, radius, 180 * degrees, 270 *
degrees);
+cairo_close_path(cr);
+cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+cairo_fill_preserve (cr);
+cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
+cairo_stroke (cr);
+
+cairo_destroy (cr);
+return FALSE;
+}
+
+static gboolean
paint_selected (GtkWidget *w, GdkEventExpose *event, gpointer data)
{
g_return_val_if_fail (GTK_IS_WIDGET(w), FALSE);
@@ -351,6 +389,7 @@ static TabwinWidget *
tabwinCreateWidget (Tabwin *tabwin, ScreenInfo *screen_info, gint monitor_num)
{
TabwinWidget *tbw;
+GdkScreen *screen;
GtkWidget *vbox;
GtkWidget *windowlist;
GdkRectangle monitor;
@@ -370,8 +409,19 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
gtk_widget_style_get (GTK_WIDGET (tbw), border-width, border_width,
NULL);
gtk_window_set_screen (GTK_WINDOW (tbw), screen_info-gscr);
gtk_widget_set_name (GTK_WIDGET (tbw), xfwm4-tabwin);
+
+/* Only do the rounded corners and transparency if a compositor is in use
*/
+screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
+if(gdk_screen_is_composited(screen)) {
+g_signal_connect (tbw, expose-event, GTK_SIGNAL_FUNC
(tabwin_expose), (gpointer) tbw);
+GdkColormap *cmap = gdk_screen_get_rgba_colormap(screen);
+if(cmap)
+gtk_widget_set_colormap(GTK_WIDGET(tbw), cmap);
+}
+
gtk_widget_realize (GTK_WIDGET (tbw));
gtk_container_set_border_width (GTK_CONTAINER (tbw), 6);
+gtk_widget_set_app_paintable(GTK_WIDGET(tbw), TRUE);
gtk_window_set_position (GTK_WINDOW (tbw), GTK_WIN_POS_NONE);
gdk_screen_get_monitor_geometry (screen_info-gscr, tbw-monitor_num,
monitor);
gtk_window_move (GTK_WINDOW(tbw), monitor.x + monitor.width / 2,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Replace GtkImage with GtkButton in Tabwin and reorder layout accordingly
Updating branch refs/heads/master
to 57249e54924c8a22d74a927e888cef621f13f434 (commit)
from 32f39080a434bcaa521b577f67ec060f18918425 (commit)
commit 57249e54924c8a22d74a927e888cef621f13f434
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Jul 9 01:20:08 2013 +0200
Replace GtkImage with GtkButton in Tabwin and reorder layout accordingly
src/tabwin.c | 104 ++
src/tabwin.h |1 -
2 files changed, 32 insertions(+), 73 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index c130418..3111fb0 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -101,18 +101,8 @@ paint_selected (GtkWidget *w, GdkEventExpose *event,
gpointer data)
g_return_val_if_fail (GTK_IS_WIDGET(w), FALSE);
TRACE (entering paint_selected);
-gtk_draw_flat_box (w-style, w-window,
-GTK_STATE_SELECTED,
-GTK_SHADOW_NONE,
-w-allocation.x - WIN_ICON_BORDER,
-w-allocation.y - WIN_ICON_BORDER,
-w-allocation.width + 2 * WIN_ICON_BORDER,
-w-allocation.height + 2 * WIN_ICON_BORDER);
-gtk_draw_focus (w-style, w-window,
-w-allocation.x - WIN_ICON_BORDER,
-w-allocation.y - WIN_ICON_BORDER,
-w-allocation.width + 2 * WIN_ICON_BORDER,
-w-allocation.height + 2 * WIN_ICON_BORDER);
+gtk_button_set_relief (GTK_BUTTON (w), GTK_RELIEF_NORMAL);
+
return FALSE;
}
@@ -124,8 +114,8 @@ pretty_string (const gchar *s)
if (s)
{
-canonical = g_ascii_strup (s, -1);
-g_strcanon (canonical, []()0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ, '
');
+canonical = g_strdup_printf (%s,s);
+g_strcanon (canonical,
[]()0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz, ' ');
g_strstrip (canonical);
}
else
@@ -139,7 +129,6 @@ pretty_string (const gchar *s)
static void
tabwinSetLabel (TabwinWidget *tbw, gchar *class, gchar *label, int workspace)
{
-gchar *markup;
gchar *message;
PangoLayout *layout;
@@ -147,12 +136,9 @@ tabwinSetLabel (TabwinWidget *tbw, gchar *class, gchar
*label, int workspace)
TRACE (entering tabwinSetLabel);
message = pretty_string (class);
-markup = g_strconcat (span size=\larger\ weight=\bold\, message,
/span, NULL);
+gtk_button_set_label (GTK_BUTTON (tbw-selected), message);
g_free (message);
-gtk_label_set_markup (GTK_LABEL (tbw-class), markup);
-g_free (markup);
-
if (tbw-tabwin-display_workspace)
{
message = g_strdup_printf ([%i] - %s, workspace + 1, label);
@@ -217,7 +203,6 @@ createWindowIcon (Client *c, gint icon_size)
icon_pixbuf = getAppIcon (c-screen_info-display_info, c-window,
icon_size, icon_size);
icon_pixbuf_stated = NULL;
icon = gtk_image_new ();
-g_object_set_data (G_OBJECT (icon), client-ptr-val, c);
if (icon_pixbuf)
{
@@ -261,7 +246,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
{
Client *c;
GList *client_list;
-GtkWidget *windowlist, *icon, *selected;
+GtkWidget *windowlist, *icon, *selected, *window_button;
int packpos, monitor_width;
Tabwin *t;
gint icon_size = WIN_ICON_SIZE;
@@ -280,29 +265,35 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
tbw-grid_rows = screen_info-client_count / tbw-grid_cols + 1;
tbw-widgets = NULL;
windowlist = gtk_table_new (tbw-grid_rows, tbw-grid_cols, FALSE);
-
/* pack the client icons */
for (client_list = *t-client_list; client_list; client_list = g_list_next
(client_list))
{
c = (Client *) client_list-data;
TRACE (createWindowlist: adding %s, c-name);
icon = createWindowIcon (c, icon_size);
-gtk_table_attach (GTK_TABLE (windowlist), GTK_WIDGET (icon),
+
+window_button = gtk_button_new_with_label ();
+g_object_set_data (G_OBJECT (window_button), client-ptr-val, c);
+gtk_button_set_image (GTK_BUTTON (window_button), icon);
+gtk_button_set_image_position (GTK_BUTTON (window_button),
GTK_POS_TOP);
+gtk_button_set_relief (GTK_BUTTON (window_button), GTK_RELIEF_NONE);
+gtk_widget_set_size_request (GTK_WIDGET (window_button), icon_size+24,
icon_size+24);
+
+gtk_table_attach (GTK_TABLE (windowlist), GTK_WIDGET (window_button),
packpos % tbw-grid_cols, packpos % tbw-grid_cols + 1,
packpos / tbw-grid_cols, packpos / tbw-grid_cols + 1,
-GTK_FILL, GTK_FILL, 7, 7);
-tbw-widgets = g_list_append (tbw-widgets, icon);
+GTK_FILL, GTK_FILL, 2, 2);
+tbw-widgets = g_list_append (tbw-widgets, window_button);
packpos++;
if (c == t-selected-data)
{
-selected = icon;
+selected = window_button;
}
}
if (selected)
{
tabwinSetSelected (tbw, selected);
}
-
return windowlist;
}
@@ -360,11 +351,8 @@
[Xfce4-commits] xfwm4:master Fix ellipsizing on app-buttons in tabwin
Updating branch refs/heads/master
to 729c4f1220c91c1af8c4649e6cb6eefdb209e5ae (commit)
from 03eee566b7afe73a15227e328b179eeac238dc6d (commit)
commit 729c4f1220c91c1af8c4649e6cb6eefdb209e5ae
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jul 13 11:53:45 2013 +0200
Fix ellipsizing on app-buttons in tabwin
src/tabwin.c | 52 +---
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 0890702..6803f63 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -165,7 +165,7 @@ pretty_string (const gchar *s)
}
static void
-tabwinSetLabel (TabwinWidget *tbw, gchar *class, gchar *label, int workspace)
+tabwinSetLabel (TabwinWidget *tbw, GtkWidget *buttonlabel, gchar *class, gchar
*label, int workspace)
{
gchar *message;
PangoLayout *layout;
@@ -174,7 +174,7 @@ tabwinSetLabel (TabwinWidget *tbw, gchar *class, gchar
*label, int workspace)
TRACE (entering tabwinSetLabel);
message = pretty_string (class);
-gtk_button_set_label (GTK_BUTTON (tbw-selected), message);
+gtk_label_set_text (GTK_LABEL (buttonlabel), message);
g_free (message);
if (tbw-tabwin-display_workspace)
@@ -196,7 +196,7 @@ tabwinSetLabel (TabwinWidget *tbw, gchar *class, gchar
*label, int workspace)
}
static void
-tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w)
+tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w, GtkWidget *l)
{
Client *c;
gchar *classname;
@@ -217,7 +217,7 @@ tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w)
c = g_object_get_data (G_OBJECT (tbw-selected), client-ptr-val);
classname = g_strdup(c-class.res_class);
-tabwinSetLabel (tbw, classname, c-name, c-win_workspace);
+tabwinSetLabel (tbw, l, classname, c-name, c-win_workspace);
g_free (classname);
}
@@ -277,7 +277,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
{
Client *c;
GList *client_list;
-GtkWidget *windowlist, *icon, *selected, *window_button;
+GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox,
*buttonlabel, *selected_label;
int packpos, monitor_width;
Tabwin *t;
gint icon_size = WIN_ICON_SIZE;
@@ -300,15 +300,23 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
for (client_list = *t-client_list; client_list; client_list = g_list_next
(client_list))
{
c = (Client *) client_list-data;
-TRACE (createWindowlist: adding %s, c-name);
-icon = createWindowIcon (c, icon_size);
+TRACE (createWindowlist: adding %s, c-name);
-window_button = gtk_button_new_with_label ();
-g_object_set_data (G_OBJECT (window_button), client-ptr-val, c);
-gtk_button_set_image (GTK_BUTTON (window_button), icon);
-gtk_button_set_image_position (GTK_BUTTON (window_button),
GTK_POS_TOP);
+window_button = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (window_button), GTK_RELIEF_NONE);
gtk_widget_set_size_request (GTK_WIDGET (window_button), icon_size+24,
icon_size+24);
+g_object_set_data (G_OBJECT (window_button), client-ptr-val, c);
+buttonbox = gtk_vbox_new (FALSE, 0);
+gtk_container_add (GTK_CONTAINER (window_button), buttonbox);
+
+icon = createWindowIcon (c, icon_size);
+gtk_box_pack_start (GTK_BOX (buttonbox), icon, FALSE, TRUE, 0);
+
+buttonlabel = gtk_label_new ();
+gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
+gtk_label_set_justify (GTK_LABEL (buttonlabel), GTK_JUSTIFY_CENTER);
+gtk_label_set_ellipsize (GTK_LABEL (buttonlabel), PANGO_ELLIPSIZE_END);
+gtk_box_pack_start (GTK_BOX (buttonbox), buttonlabel, TRUE, TRUE, 0);
gtk_table_attach (GTK_TABLE (windowlist), GTK_WIDGET (window_button),
packpos % tbw-grid_cols, packpos % tbw-grid_cols + 1,
@@ -319,11 +327,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
if (c == t-selected-data)
{
selected = window_button;
+selected_label = buttonlabel;
}
}
if (selected)
{
-tabwinSetSelected (tbw, selected);
+tabwinSetSelected (tbw, selected, selected_label);
}
return windowlist;
}
@@ -453,7 +462,7 @@ static Client *
tabwinChange2Selected (Tabwin *t, GList *selected)
{
GList *tabwin_list, *widgets;
-GtkWidget *window_button;
+GtkWidget *window_button, *buttonbox, *buttonlabel;
TabwinWidget *tbw;
t-selected = selected;
@@ -464,10 +473,13 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
{
window_button = GTK_WIDGET (widgets-data);
gtk_button_set_relief (GTK_BUTTON (window_button),
GTK_RELIEF_NONE);
-gtk_button_set_label (GTK_BUTTON (window_button), );
+buttonbox = GTK_WIDGET(
[Xfce4-commits] xfwm4:master Tweak padding of tabwin
Updating branch refs/heads/master to e3e437c4445bcfe1dfbf246093982f3e352275be (commit) from 413bccdc0f58cf3f7259b5b0e9c714b922ea3696 (commit) commit e3e437c4445bcfe1dfbf246093982f3e352275be Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sat Jul 13 02:48:16 2013 +0200 Tweak padding of tabwin src/tabwin.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tabwin.c b/src/tabwin.c index ad949df..dbe9b6c 100644 --- a/src/tabwin.c +++ b/src/tabwin.c @@ -420,14 +420,14 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo *screen_info, gint monitor_num) } gtk_widget_realize (GTK_WIDGET (tbw)); -gtk_container_set_border_width (GTK_CONTAINER (tbw), 6); +gtk_container_set_border_width (GTK_CONTAINER (tbw), 12); gtk_widget_set_app_paintable(GTK_WIDGET(tbw), TRUE); gtk_window_set_position (GTK_WINDOW (tbw), GTK_WIN_POS_NONE); gdk_screen_get_monitor_geometry (screen_info-gscr, tbw-monitor_num, monitor); gtk_window_move (GTK_WINDOW(tbw), monitor.x + monitor.width / 2, monitor.y + monitor.height / 2); -vbox = gtk_vbox_new (FALSE, 5); +vbox = gtk_vbox_new (FALSE, 3); gtk_container_add (GTK_CONTAINER (tbw), vbox); tbw-label = gtk_label_new (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Change visual of minimized apps in tabwin Remove [] from label and increase saturation a little
Updating branch refs/heads/master
to 03eee566b7afe73a15227e328b179eeac238dc6d (commit)
from e3e437c4445bcfe1dfbf246093982f3e352275be (commit)
commit 03eee566b7afe73a15227e328b179eeac238dc6d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jul 13 02:50:09 2013 +0200
Change visual of minimized apps in tabwin
Remove [] from label and increase saturation a little
src/tabwin.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index dbe9b6c..0890702 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -216,14 +216,7 @@ tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w)
NULL);
c = g_object_get_data (G_OBJECT (tbw-selected), client-ptr-val);
-if (FLAG_TEST (c-flags, CLIENT_FLAG_ICONIFIED))
-{
-classname = g_strdup_printf ([ %s ], c-class.res_class);
-}
-else
-{
-classname = g_strdup(c-class.res_class);
-}
+classname = g_strdup(c-class.res_class);
tabwinSetLabel (tbw, classname, c-name, c-win_workspace);
g_free (classname);
}
@@ -247,7 +240,7 @@ createWindowIcon (Client *c, gint icon_size)
if (FLAG_TEST (c-flags, CLIENT_FLAG_ICONIFIED))
{
icon_pixbuf_stated = gdk_pixbuf_copy (icon_pixbuf);
-gdk_pixbuf_saturate_and_pixelate (icon_pixbuf, icon_pixbuf_stated,
0.25, TRUE);
+gdk_pixbuf_saturate_and_pixelate (icon_pixbuf, icon_pixbuf_stated,
0.55, TRUE);
gtk_image_set_from_pixbuf (GTK_IMAGE (icon), icon_pixbuf_stated);
g_object_unref(icon_pixbuf_stated);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Improve drawing for non-composited tabwin Use GTK_STATE_SELECTED color to draw the border, like in xfsm-logout
Updating branch refs/heads/master
to d2a728a22fc61219123eabd4a25d77ad8fc614cf (commit)
from 729c4f1220c91c1af8c4649e6cb6eefdb209e5ae (commit)
commit d2a728a22fc61219123eabd4a25d77ad8fc614cf
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jul 13 13:11:20 2013 +0200
Improve drawing for non-composited tabwin
Use GTK_STATE_SELECTED color to draw the border, like in xfsm-logout
src/tabwin.c | 54 ++
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 6803f63..e1077a2 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -100,6 +100,7 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
{
GtkWindow *window;
GdkScreen *screen;
+GdkColor *bg_normal, *bg_insensitive;
cairo_t *cr;
gint radius = 10.0;
double degrees = 3.14 / 180.0;
@@ -108,27 +109,40 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
window = GTK_WINDOW(tbw);
screen = gtk_window_get_screen(window);
-
+screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
cr = gdk_cairo_create (tbw-window);
-cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
-gdk_cairo_region(cr, event-region);
-cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
-cairo_fill_preserve(cr);
-cairo_clip(cr);
-cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-
-//Draw a filled rounded rectangle with an outline
cairo_set_line_width (cr, 1.0);
-cairo_arc (cr, width - radius - 0.5, radius + 0.5, radius, -90 * degrees,
0 * degrees);
-cairo_arc (cr, width - radius - 0.5, height - radius - 0.5, radius, 0 *
degrees, 90 * degrees);
-cairo_arc (cr, radius + 0.5, height - radius - 0.5, radius, 90 * degrees,
180 * degrees);
-cairo_arc (cr, radius + 0.5, radius + 0.5, radius, 180 * degrees, 270 *
degrees);
-cairo_close_path(cr);
-cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
-cairo_fill_preserve (cr);
-cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
-cairo_stroke (cr);
-
+
+if(gdk_screen_is_composited(screen)) {
+cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+gdk_cairo_region(cr, event-region);
+cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
+cairo_fill_preserve(cr);
+cairo_clip(cr);
+cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+
+//Draw a filled rounded rectangle with an outline
+cairo_arc (cr, width - radius - 0.5, radius + 0.5, radius, -90 *
degrees, 0 * degrees);
+cairo_arc (cr, width - radius - 0.5, height - radius - 0.5, radius, 0
* degrees, 90 * degrees);
+cairo_arc (cr, radius + 0.5, height - radius - 0.5, radius, 90 *
degrees, 180 * degrees);
+cairo_arc (cr, radius + 0.5, radius + 0.5, radius, 180 * degrees, 270
* degrees);
+cairo_close_path(cr);
+cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
+cairo_fill_preserve (cr);
+cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
+cairo_stroke (cr);
+}
+else {
+cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+cairo_rectangle(cr, 0, 0, width, height);
+bg_normal = get_color(tbw, GTK_STATE_NORMAL);
+gdk_cairo_set_source_color(cr, bg_normal);
+cairo_fill_preserve (cr);
+bg_insensitive = get_color(tbw, GTK_STATE_SELECTED);
+gdk_cairo_set_source_color(cr, bg_insensitive);
+cairo_stroke (cr);
+}
+
cairo_destroy (cr);
return FALSE;
}
@@ -415,7 +429,6 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
/* Only do the rounded corners and transparency if a compositor is in use
*/
screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
if(gdk_screen_is_composited(screen)) {
-g_signal_connect (tbw, expose-event, GTK_SIGNAL_FUNC
(tabwin_expose), (gpointer) tbw);
GdkColormap *cmap = gdk_screen_get_rgba_colormap(screen);
if(cmap)
gtk_widget_set_colormap(GTK_WIDGET(tbw), cmap);
@@ -452,6 +465,7 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
g_signal_connect_swapped (tbw, configure-event,
GTK_SIGNAL_FUNC (tabwinConfigure), (gpointer)
tbw);
+g_signal_connect (tbw, expose-event, GTK_SIGNAL_FUNC (tabwin_expose),
(gpointer) tbw);
gtk_widget_show_all (GTK_WIDGET (tbw));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix property types thanks Nick
Updating branch refs/heads/master to fc54acd08dffdd2d0aabb22b4946b36531dfd787 (commit) from 913bc9c5ae9cde40c363ead5b081583bd75bd0b1 (commit) commit fc54acd08dffdd2d0aabb22b4946b36531dfd787 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Jul 14 05:48:07 2013 +0200 Fix property types thanks Nick src/tabwin.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tabwin.c b/src/tabwin.c index 001e9ec..f5161ce 100644 --- a/src/tabwin.c +++ b/src/tabwin.c @@ -420,14 +420,14 @@ tabwin_widget_class_init (TabwinWidgetClass *klass) WIN_BORDER_WIDTH, G_PARAM_READABLE)); gtk_widget_class_install_style_property (widget_class, - g_param_spec_int(border-alpha, + g_param_spec_double(border-alpha, border alpha, the alpha of the colored border, 0.0, 1.0, WIN_BORDER_ALPHA, G_PARAM_READABLE)); gtk_widget_class_install_style_property (widget_class, - g_param_spec_int(alpha, + g_param_spec_double(alpha, alpha, the alpha of the window, 0.0, 1.0, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix cursor wrapping in grid mode with only one row
Updating branch refs/heads/master
to d7b2f5287ecb9e7da2ee33faf86656fc18b0a14e (commit)
from 8f9411380894cd7ccd4025ff528d8a8e19161bd5 (commit)
commit d7b2f5287ecb9e7da2ee33faf86656fc18b0a14e
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 11:53:19 2013 +0300
Fix cursor wrapping in grid mode with only one row
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 4572f06..4d6f887 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -974,7 +974,16 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
else if (col_current = cols)
{
col_current = 0;
-row_current++;
+if (rows 1)
+{
+row_current++;
+}
+else
+{
+/* If there's only 1 row then col needs to wrap back to
+ * the head of the grid */
+col_current = 0;
+}
}
/* Wrap row */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Improve keyboard navigation in the tabwin
Updating branch refs/heads/master
to e34c5b6426a5c9cf89f711b23557aa50c8763364 (commit)
from fd296893527c2c1cccf3ce6202a7f9340992d481 (commit)
commit e34c5b6426a5c9cf89f711b23557aa50c8763364
Author: Eric Koegel eric.koe...@gmail.com
Date: Wed Nov 27 17:25:10 2013 +0300
Improve keyboard navigation in the tabwin
When cycling applications have the keyboard wrap around when it
reaches the end of a row or column.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 37 +
1 file changed, 37 insertions(+)
diff --git a/src/tabwin.c b/src/tabwin.c
index 35e96b8..72f79d2 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -787,10 +787,20 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int
col_delta)
if (col_current 0)
{
col_current = cols - 1;
+row_current--;
+if (row_current 0)
+{
+row_current = rows - 1;
+}
}
else if (col_current = cols)
{
col_current = 0;
+row_current++;
+if (row_current = rows)
+{
+row_current = rows - 1;
+}
}
/* Wrap row */
@@ -798,10 +808,29 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int
col_delta)
if (row_current 0)
{
row_current = rows - 1;
+col_current--;
+if (col_current 0)
+{
+col_current = cols - 1;
+}
}
else if (row_current = rows)
{
row_current = 0;
+col_current++;
+if (col_current = cols)
+{
+if (rows != 1)
+{
+col_current = cols - 1;
+}
+else
+{
+/* If there's only 1 row then col needs to wrap back to
+ * the head of the grid */
+col_current = 0;
+}
+}
}
/* So here we are at the new (wrapped) position in the rectangle */
@@ -812,7 +841,10 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
{
if (col_delta 0)
{
+/* In this case we're going past the tail, reset to the head
+ * of the grid */
col_current = 0;
+row_current = 0;
}
else
{
@@ -824,6 +856,11 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
if (row_delta 0)
{
row_current = 0;
+col_current++;
+if (col_current = cols)
+{
+col_current = 0;
+}
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Tabwin list mode relative label width
Updating branch refs/heads/master
to 5eb8024cf1b28922dda6109d43032a1a4aefa20e (commit)
from d7b2f5287ecb9e7da2ee33faf86656fc18b0a14e (commit)
commit 5eb8024cf1b28922dda6109d43032a1a4aefa20e
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 12:46:43 2013 +0300
Tabwin list mode relative label width
The width of the application label in the tabwin window while in
list mode is now relative to the number of columns displays. This
is scaled to the width of the smallest monitor attached. Now there's
space for more label info when there are fewer columns and it properly
displays all the windows when there are lots of them open.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 4d6f887..545e749 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -435,7 +435,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
Client *c;
GList *client_list;
GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox,
*buttonlabel, *selected_label;
-int packpos, monitor_width, monitor_height, app_label_height;
+int packpos, monitor_width, monitor_height, app_label_height, label_width;
Tabwin *t;
PangoLayout *layout;
gint icon_size = WIN_ICON_SIZE;
@@ -495,10 +495,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
}
else
{
+label_width = monitor_width / (tbw-grid_cols + 1);
+
if (icon_size app_label_height)
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
label_width, app_label_height+8);
else
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, icon_size+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
label_width, icon_size+8);
buttonbox = gtk_hbox_new (FALSE, 6);
buttonlabel = gtk_label_new (c-name);
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0, 0.5);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Change tabwin focused buttons state from GTK_STATE_NORMAL to GTK_STATE_SELECTED
Updating branch refs/heads/master
to 8f9411380894cd7ccd4025ff528d8a8e19161bd5 (commit)
from 4053aaeee1c1dd7a4c15aec966beb32e06394c7d (commit)
commit 8f9411380894cd7ccd4025ff528d8a8e19161bd5
Author: Cédric Leporcq ced...@gmail.com
Date: Thu Dec 5 00:42:03 2013 +0100
Change tabwin focused buttons state from GTK_STATE_NORMAL to
GTK_STATE_SELECTED
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 33 +
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 08d2f05..4572f06 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -175,11 +175,22 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
}
static gboolean
-paint_selected (GtkWidget *w, GdkEventExpose *event, gpointer data)
+paint_selected (GtkWidget *w, GdkEventExpose *event, gpointer user_data)
{
+TabwinWidget *tbw = user_data;
+
g_return_val_if_fail (GTK_IS_WIDGET(w), FALSE);
TRACE (entering paint_selected);
+if (w == tbw-tabwin-hovered)
+{
+gtk_widget_set_state (w, GTK_STATE_ACTIVE);
+}
+else
+{
+gtk_widget_set_state (w, GTK_STATE_SELECTED);
+}
+
gtk_button_set_relief (GTK_BUTTON (w), GTK_RELIEF_NORMAL);
return FALSE;
@@ -254,7 +265,7 @@ tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w,
GtkWidget *l)
tbw-selected_callback = g_signal_connect (G_OBJECT (tbw-selected),
expose-event,
G_CALLBACK (paint_selected),
- NULL);
+ tbw);
c = g_object_get_data (G_OBJECT (tbw-selected), client-ptr-val);
@@ -358,6 +369,11 @@ cb_window_button_enter (GtkWidget *widget, GdkEvent
*event, gpointer user_data)
* select it */
if (c != NULL)
{
+if (gtk_widget_is_focus (widget))
+{
+gtk_widget_set_state (widget, GTK_STATE_ACTIVE);
+}
+
/* we don't update the labels on mouse over for this mode */
if (c-screen_info-params-cycle_tabwin_mode == OVERFLOW_COLUMN_GRID)
{
@@ -385,14 +401,15 @@ cb_window_button_leave (GtkWidget *widget, GdkEvent
*event, gpointer user_data)
g_return_val_if_fail (tbw != NULL, FALSE);
+tbw-tabwin-hovered = NULL;
+
/* don't do anything if we have the focus */
if (gtk_widget_is_focus (widget))
{
+gtk_widget_set_state (widget, GTK_STATE_SELECTED);
return FALSE;
}
-tbw-tabwin-hovered = NULL;
-
c = g_object_get_data (G_OBJECT (widget), client-ptr-val);
/* when hovering over a window icon, display it's label but don't
@@ -708,6 +725,14 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
tabwinSetSelected (tbw, window_button, buttonlabel);
gtk_widget_queue_draw (GTK_WIDGET(tbw));
}
+else if (window_button == t-hovered)
+{
+gtk_widget_set_state (window_button, GTK_STATE_PRELIGHT);
+}
+else
+{
+gtk_widget_set_state (window_button, GTK_STATE_NORMAL);
+}
}
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Simplify string for checkbox to activate listview
Updating branch refs/heads/master to 6be40e9f72ca6828254ecfa9ae6795358cd38e6d (commit) from de06e532227ccbe1313bb82b6e021f08b0639aa5 (commit) commit 6be40e9f72ca6828254ecfa9ae6795358cd38e6d Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Dec 5 13:01:18 2013 +0100 Simplify string for checkbox to activate listview settings-dialogs/xfwm4-tweaks-dialog.glade |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade index f7b7087..66a95ee 100644 --- a/settings-dialogs/xfwm4-tweaks-dialog.glade +++ b/settings-dialogs/xfwm4-tweaks-dialog.glade @@ -173,7 +173,7 @@ or skip taskbar properties set/property /child child object class=GtkCheckButton id=cycle_tabwin_mode -property name=label translatable=yesShow windows being cycled in a _list instead of an icon grid/property +property name=label translatable=yesCycle through windows in a _list/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix mouse interactions with tabwin buttons
Updating branch refs/heads/master
to 23326d090735ea9adf09eb28ee7525280b77e4b0 (commit)
from 4f82083800158f381f44aebb9cfc0901b45042be (commit)
commit 23326d090735ea9adf09eb28ee7525280b77e4b0
Author: cedric ced...@gmail.com
Date: Sun Dec 1 01:36:11 2013 +0100
Fix mouse interactions with tabwin buttons
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index c25a403..e8713b8 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -673,13 +673,17 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
if (c != NULL)
{
-if (c-screen_info-params-cycle_tabwin_mode ==
STANDARD_ICON_GRID)
+/* don't clear label if mouse is inside the previously
+ * selected button */
+if (c-screen_info-params-cycle_tabwin_mode ==
STANDARD_ICON_GRID
+ window_button != t-hovered)
{
gtk_label_set_text (GTK_LABEL (buttonlabel), );
}
if (c == t-selected-data)
{
+gtk_widget_grab_focus (window_button);
tabwinSetSelected (tbw, window_button, buttonlabel);
gtk_widget_queue_draw (GTK_WIDGET(tbw));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Account for custom font sizes in the tabwin label
Updating branch refs/heads/master
to 3503b8e6cffd83d7198b18d7af747c7f903b477e (commit)
from 23326d090735ea9adf09eb28ee7525280b77e4b0 (commit)
commit 3503b8e6cffd83d7198b18d7af747c7f903b477e
Author: Eric Koegel eric.koe...@gmail.com
Date: Mon Dec 2 08:29:53 2013 +0300
Account for custom font sizes in the tabwin label
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index e8713b8..237b44e 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -414,8 +414,9 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
Client *c;
GList *client_list;
GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox,
*buttonlabel, *selected_label;
-int packpos, monitor_width, monitor_height;
+int packpos, monitor_width, monitor_height, app_label_height;
Tabwin *t;
+PangoLayout *layout;
gint icon_size = WIN_ICON_SIZE;
TRACE (entering createWindowlist);
@@ -460,7 +461,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+24);
+/* We need to account for changes to the font size in the user's
+ * appearance theme and gtkrc settings */
+layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
+pango_layout_get_pixel_size (layout, NULL, app_label_height);
+
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+app_label_height+8);
buttonbox = gtk_vbox_new (FALSE, 0);
buttonlabel = gtk_label_new ();
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Allow cycle through windows with mouse wheel
Updating branch refs/heads/master
to 4053aaeee1c1dd7a4c15aec966beb32e06394c7d (commit)
from 642fef640679396fe89c37408a79ae94b39d6a44 (commit)
commit 4053aaeee1c1dd7a4c15aec966beb32e06394c7d
Author: Cédric Leporcq ced...@gmail.com
Date: Thu Dec 5 00:23:07 2013 +0100
Allow cycle through windows with mouse wheel
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 49 ++---
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 6051d61..77bf9c7 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -330,21 +330,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
cycling = FALSE;
}
}
-
-if (cycling)
-{
-if (c)
-{
-if (passdata-wireframe)
-{
-wireframeUpdate (c, passdata-wireframe);
-}
-}
-else
-{
-cycling = FALSE;
-}
-}
}
break;
case KeyRelease:
@@ -378,8 +363,24 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
c = tabwinSelectHoveredWidget (passdata-tabwin);
break;
}
+else if (ev.button == Button4)
+{
+/* Mouse wheel scroll up */
+TRACE (Cycle: previous);
+c2 = tabwinSelectPrev(passdata-tabwin);
+}
+else if (ev.button == Button5)
+{
+/* Mouse wheel scroll down */
+TRACE (Cycle: next);
+c2 = tabwinSelectNext(passdata-tabwin);
+}
}
}
+if (c2)
+{
+c = c2;
+}
}
break;
default:
@@ -393,6 +394,24 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
gtk_main_quit ();
}
+if (status == EVENT_FILTER_STOP)
+{
+if (cycling)
+{
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
+{
+cycling = FALSE;
+}
+}
+}
+
return status;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix memory leak
Updating branch refs/heads/master
to 2a5b9aba48b3a6cca7d29a7fa8549d9b045facc3 (commit)
from 5eb8024cf1b28922dda6109d43032a1a4aefa20e (commit)
commit 2a5b9aba48b3a6cca7d29a7fa8549d9b045facc3
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 13:17:46 2013 +0300
Fix memory leak
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |1 +
1 file changed, 1 insertion(+)
diff --git a/src/tabwin.c b/src/tabwin.c
index 545e749..f13f015 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -485,6 +485,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
* appearance theme and gtkrc settings */
layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
pango_layout_get_pixel_size (layout, NULL, app_label_height);
+g_object_unref (layout);
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Shrink the app icon when out of space
Updating branch refs/heads/master
to 3658e525ac0952a1f98ac7bad59d6a5c4aa8e22c (commit)
from 3cd369280609cc0e1b3d4ea0be164897a323595d (commit)
commit 3658e525ac0952a1f98ac7bad59d6a5c4aa8e22c
Author: Eric Koegel eric.koe...@gmail.com
Date: Sun Dec 15 11:46:25 2013 +0300
Shrink the app icon when out of space
In the standard icon grid and there's a lot of windows to display,
shrink the icon size until all the windows will fit. This does it
by halving the current icon size. If the icon size goes below 8,
it will stop there so the icons are still present.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 30 +++---
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index c5d8846..0c6e5f1 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -453,10 +453,32 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
gtk_widget_style_get (GTK_WIDGET (tbw), icon-size, icon_size, NULL);
tbw-widgets = NULL;
+/* We need to account for changes to the font size in the user's
+ * appearance theme and gtkrc settings */
+layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
+pango_layout_get_pixel_size (layout, NULL, app_label_height);
+g_object_unref (layout);
+
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-tbw-grid_cols = (monitor_width / (icon_size + 2 * WIN_ICON_BORDER)) *
0.75;
+tbw-grid_cols = (monitor_width / (icon_size+app_label_height+10)) *
0.75;
tbw-grid_rows = screen_info-client_count / tbw-grid_cols + 1;
+
+/* If we run out of space, halve the icon size to make more room. */
+while ((icon_size + app_label_height + 10) * tbw-grid_rows
monitor_height - app_label_height)
+{
+icon_size = icon_size / 2;
+/* recalculate with new icon size */
+tbw-grid_cols = (monitor_width / (icon_size+app_label_height+10))
* 0.75;
+tbw-grid_rows = screen_info-client_count / tbw-grid_cols + 1;
+
+/* Shrinking the icon too much makes it hard to see */
+if (icon_size 8)
+{
+icon_size = 8;
+break;
+}
+}
}
else
{
@@ -481,12 +503,6 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
g_signal_connect (window_button, leave-notify-event, G_CALLBACK
(cb_window_button_leave), tbw);
gtk_widget_add_events (window_button, GDK_ENTER_NOTIFY_MASK);
-/* We need to account for changes to the font size in the user's
- * appearance theme and gtkrc settings */
-layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
-pango_layout_get_pixel_size (layout, NULL, app_label_height);
-g_object_unref (layout);
-
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+app_label_height+10, icon_size+app_label_height+10);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Don't select the window when it gets mouse focus
Updating branch refs/heads/master
to fd296893527c2c1cccf3ce6202a7f9340992d481 (commit)
from 3de6a9bf12ee4e6cd94126c14d200719f82d1431 (commit)
commit fd296893527c2c1cccf3ce6202a7f9340992d481
Author: Eric Koegel eric.koe...@gmail.com
Date: Tue Nov 26 16:14:05 2013 +0300
Don't select the window when it gets mouse focus
Instead of selecting the window, just update the labels in the
tabwin window when the window icon gets the focus. If the user
clicks on the window icon then the widget the mouse is hovering
over will be selected and the tabwin window will disappear.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 33 +++
src/tabwin.c | 71 --
src/tabwin.h |4 +++-
3 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 79989ed..3af6aea 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -227,7 +227,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
DisplayInfo *display_info;
ClientCycleData *passdata;
Client *c, *removed;
-static Client *last_selected = NULL;
eventFilterStatus status;
KeyCode cancel, left, right, up, down;
int key, modifiers;
@@ -329,8 +328,18 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
cycling = FALSE;
}
+}
-if (!c)
+if (cycling)
+{
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
{
cycling = FALSE;
}
@@ -357,11 +366,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
break;
-case MotionNotify:
-status = EVENT_FILTER_CONTINUE;
-/* window of the event, we might accept it later */
-mouse_window = xevent-xcrossing.window;
-break;
default:
status = EVENT_FILTER_CONTINUE;
break;
@@ -374,20 +378,9 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
{
-c = tabwinSelectWidget (passdata-tabwin, li-data);
-break;
-}
-}
-}
+c = tabwinSelectHoveredWidget (passdata-tabwin);
-if (cycling)
-{
-if (c)
-{
-if (passdata-wireframe last_selected != c)
-{
-last_selected = c;
-wireframeUpdate (c, passdata-wireframe);
+break;
}
}
}
diff --git a/src/tabwin.c b/src/tabwin.c
index 0758d36..35e96b8 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -312,15 +312,54 @@ getMinMonitorWidth (ScreenInfo *screen_info)
static gboolean
cb_window_button_enter (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
-Tabwin *t = user_data;
+TabwinWidget *tbw = user_data;
+Client *c;
+GtkWidget *buttonbox, *buttonlabel;
+gchar *classname;
+
+TRACE (entering);
+
+g_return_val_if_fail (tbw != NULL, FALSE);
+
+c = g_object_get_data (G_OBJECT (widget), client-ptr-val);
+
+/* keep track of which widget we're hovered over */
+tbw-tabwin-hovered = widget;
+
+/* when hovering over a window icon, display it's label but don't
+ * select it */
+if (c != NULL)
+{
+buttonbox = GTK_WIDGET(
gtk_container_get_children(GTK_CONTAINER(widget))[0].data );
+buttonlabel = GTK_WIDGET( g_list_nth_data(
gtk_container_get_children(GTK_CONTAINER(buttonbox)), 1) );
+
+classname = g_strdup(c-class.res_class);
+tabwinSetLabel (tbw, buttonlabel, classname, c-name,
c-win_workspace);
+g_free (classname);
+}
+
+return FALSE;
+}
+
+static gboolean
+cb_window_button_leave (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+TabwinWidget *tbw = user_data;
TRACE (entering);
-g_return_val_if_fail (t != NULL, FALSE);
+g_return_val_if_fail (tbw != NULL, FALSE);
+
+/* don't do anything if we have the focus */
+if (gtk_widget_is_focus (widget))
+{
+return FALSE;
+}
+
+tbw-tabwin-hovered = NULL;
-/* On mouse over we grab the focus for the window button and select it */
-gtk_widget_grab_focus (widget);
-tabwinSelectWidget (t, widget);
+/* reselect the selected widget, it will clear everything else out */
+tabwinSelectWidget (tbw-tabwin);
return FALSE;
}
@@ -359,7
[Xfce4-commits] xfwm4:master Install a new style property listview-icon-size themes can add Xfwm4TabwinWidget::listview-icon-size = $n to set the appicon-size in the tabwin's new listview. Curre
Updating branch refs/heads/master
to 1cf53af20b5086eba7dbc47d8237b42514d32f9d (commit)
from 3503b8e6cffd83d7198b18d7af747c7f903b477e (commit)
commit 1cf53af20b5086eba7dbc47d8237b42514d32f9d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Dec 2 16:13:34 2013 +0100
Install a new style property listview-icon-size
themes can add Xfwm4TabwinWidget::listview-icon-size = $n to set the
appicon-size in the tabwin's new listview. Currently min=16 and max=48
src/tabwin.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 237b44e..3fadbfe 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -28,6 +28,10 @@
#define WIN_ICON_SIZE 48
#endif
+#ifndef LISTVIEW_WIN_ICON_SIZE
+#define LISTVIEW_WIN_ICON_SIZE 24
+#endif
+
#ifndef WIN_ICON_BORDER
#define WIN_ICON_BORDER 5
#endif
@@ -439,7 +443,8 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
}
else
{
-icon_size = 24;
+icon_size = LISTVIEW_WIN_ICON_SIZE;
+gtk_widget_style_get (GTK_WIDGET (tbw), listview-icon-size,
icon_size, NULL);
tbw-grid_rows = (monitor_height / (icon_size + 2 * WIN_ICON_BORDER))
* 0.75;
tbw-grid_cols = screen_info-client_count / tbw-grid_rows + 1;
}
@@ -561,6 +566,13 @@ tabwin_widget_class_init (TabwinWidgetClass *klass)
WIN_ICON_SIZE,
G_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
+
g_param_spec_int(listview-icon-size,
+ listview icon
size,
+ the size of
the application icon in listview,
+ 16, 48,
+
LISTVIEW_WIN_ICON_SIZE,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property (widget_class,
g_param_spec_int(border-width,
border width,
the width of
the colored border,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Implement column list overflow tabwin mode
Updating branch refs/heads/master
to 4f82083800158f381f44aebb9cfc0901b45042be (commit)
from e34c5b6426a5c9cf89f711b23557aa50c8763364 (commit)
commit 4f82083800158f381f44aebb9cfc0901b45042be
Author: Eric Koegel eric.koe...@gmail.com
Date: Sat Nov 30 23:37:07 2013 +0300
Implement column list overflow tabwin mode
Adds an list view for the tabwin when cycling windows, as described
in the design SIG. An xfconf property and option to the wm tweaks
app has been added.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
defaults/defaults |1 +
settings-dialogs/tweaks-settings.c |5 +
settings-dialogs/xfwm4-tweaks-dialog.glade | 16 ++
src/settings.c |7 +
src/settings.h |1 +
src/tabwin.c | 252 +++-
src/tabwin.h |7 +
7 files changed, 247 insertions(+), 42 deletions(-)
diff --git a/defaults/defaults b/defaults/defaults
index 17dc3d7..78c15a5 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -10,6 +10,7 @@ cycle_draw_frame=true
cycle_apps_only=false
cycle_hidden=true
cycle_minimum=true
+cycle_tabwin_mode=0
cycle_workspaces=false
double_click_time=250
double_click_distance=5
diff --git a/settings-dialogs/tweaks-settings.c
b/settings-dialogs/tweaks-settings.c
index 568bf2d..4e9b4ef 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -167,6 +167,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
GtkWidget *cycle_hidden_check = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_hidden_check));
GtkWidget *cycle_minimum_check = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_minimum_check));
GtkWidget *cycle_draw_frame = GTK_WIDGET (gtk_builder_get_object (builder,
cycle_draw_frame));
+GtkWidget *cycle_tabwin_mode = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_tabwin_mode));
/* Focus tab */
GtkWidget *prevent_focus_stealing_check = GTK_WIDGET
(gtk_builder_get_object (builder, prevent_focus_stealing_check));
@@ -317,6 +318,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
/general/cycle_draw_frame,
G_TYPE_BOOLEAN,
(GObject *)cycle_draw_frame, active);
+xfconf_g_property_bind (xfwm4_channel,
+/general/cycle_tabwin_mode,
+G_TYPE_INT,
+(GObject *)cycle_tabwin_mode, active);
/* Focus tab */
xfconf_g_property_bind (xfwm4_channel,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade
b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 0fc58de..f7b7087 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -171,6 +171,22 @@ or skip taskbar properties set/property
property name=position3/property
/packing
/child
+child
+ object class=GtkCheckButton id=cycle_tabwin_mode
+property name=label translatable=yesShow windows
being cycled in a _list instead of an icon grid/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_underlineTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position4/property
+ /packing
+/child
/object
/child
child type=tab
diff --git a/src/settings.c b/src/settings.c
index 19fb46e..5622ba7 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -678,6 +678,7 @@ loadSettings (ScreenInfo *screen_info)
{cycle_draw_frame, NULL, G_TYPE_BOOLEAN, TRUE},
{cycle_hidden, NULL, G_TYPE_BOOLEAN, TRUE},
{cycle_minimum, NULL, G_TYPE_BOOLEAN, TRUE},
+{cycle_tabwin_mode, NULL, G_TYPE_INT, FALSE},
{cycle_workspaces, NULL, G_TYPE_BOOLEAN, TRUE},
{double_click_time, NULL, G_TYPE_INT, TRUE},
{double_click_distance, NULL, G_TYPE_INT, TRUE},
@@ -768,6 +769,8 @@ loadSettings (ScreenInfo *screen_info)
getBoolValue (cycle_draw_frame, rc);
screen_info-params-cycle_hidden =
getBoolValue (cycle_hidden, rc);
+screen_info-params-cycle_tabwin_mode =
+CLAMP (getIntValue (cycle_tabwin_mode, rc), 0, 1);
screen_info-params-cycle_workspaces =
getBoolValue (cycle_workspaces, rc);
[Xfce4-commits] xfwm4:master Install a few more style properties FIXME: alpha, border-alpha
Updating branch refs/heads/master
to 913bc9c5ae9cde40c363ead5b081583bd75bd0b1 (commit)
from 2e9b0f00d3838b4bf84a5602b24f7bf68c130fa4 (commit)
commit 913bc9c5ae9cde40c363ead5b081583bd75bd0b1
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jul 13 22:35:50 2013 +0200
Install a few more style properties
FIXME: alpha, border-alpha
src/tabwin.c | 60 --
1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index df8f47e..001e9ec 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -32,8 +32,20 @@
#define WIN_ICON_BORDER 5
#endif
-#ifndef WIN_COLOR_BORDER
-#define WIN_COLOR_BORDER 1
+#ifndef WIN_BORDER_WIDTH
+#define WIN_BORDER_WIDTH 1
+#endif
+
+#ifndef WIN_ALPHA
+#define WIN_ALPHA 0.9
+#endif
+
+#ifndef WIN_BORDER_ALPHA
+#define WIN_BORDER_ALPHA 0.5
+#endif
+
+#ifndef WIN_RADIUS
+#define WIN_RADIUS 10
#endif
#include glib.h
@@ -100,11 +112,13 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
{
GtkWindow *window;
GdkScreen *screen;
+cairo_t *cr;
GdkColor *bg_normal = get_color(tbw, GTK_STATE_NORMAL);
GdkColor *bg_selected = get_color(tbw, GTK_STATE_SELECTED);
-gint border_width = WIN_COLOR_BORDER;
-cairo_t *cr;
-gint radius = 10.0;
+gint border_width = WIN_BORDER_WIDTH;
+gdouble border_alpha = WIN_BORDER_ALPHA;
+gdouble alpha = WIN_ALPHA;
+gint radius = WIN_RADIUS;
double degrees = 3.14 / 180.0;
double width = tbw-allocation.width;
double height = tbw-allocation.height;
@@ -113,7 +127,12 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
screen = gtk_window_get_screen(window);
screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
cr = gdk_cairo_create (tbw-window);
-gtk_widget_style_get (GTK_WIDGET (tbw), border-width, border_width,
NULL);
+gtk_widget_style_get (GTK_WIDGET (tbw),
+border-width, border_width,
+border-alpha, border_alpha,
+alpha, alpha,
+radius, radius,
+NULL);
cairo_set_line_width (cr, border_width);
if(gdk_screen_is_composited(screen)) {
@@ -130,9 +149,9 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
cairo_arc (cr, radius + 0.5, height - radius - 0.5, radius, 90 *
degrees, 180 * degrees);
cairo_arc (cr, radius + 0.5, radius + 0.5, radius, 180 * degrees, 270
* degrees);
cairo_close_path(cr);
-cairo_set_source_rgba (cr, bg_normal-red/65535.0,
bg_normal-green/65535.0, bg_normal-blue/65535.0, 0.8);
+cairo_set_source_rgba (cr, bg_normal-red/65535.0,
bg_normal-green/65535.0, bg_normal-blue/65535.0, alpha);
cairo_fill_preserve (cr);
-cairo_set_source_rgba (cr, bg_selected-red/65535.0,
bg_selected-green/65535.0, bg_selected-blue/65535.0, 0.8);
+cairo_set_source_rgba (cr, bg_selected-red/65535.0,
bg_selected-green/65535.0, bg_selected-blue/65535.0, border_alpha);
cairo_stroke (cr);
}
else {
@@ -398,7 +417,28 @@ tabwin_widget_class_init (TabwinWidgetClass *klass)
border width,
the width of
the colored border,
0, 8,
-
WIN_COLOR_BORDER,
+
WIN_BORDER_WIDTH,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int(border-alpha,
+ border alpha,
+ the alpha of
the colored border,
+ 0.0, 1.0,
+
WIN_BORDER_ALPHA,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int(alpha,
+ alpha,
+ the alpha of
the window,
+ 0.0, 1.0,
+ WIN_ALPHA,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_int(radius,
+
[Xfce4-commits] xfwm4:master Make buttons in tabwin square and account for more x/ythickness in themes
Updating branch refs/heads/master
to 3cd369280609cc0e1b3d4ea0be164897a323595d (commit)
from 2a5b9aba48b3a6cca7d29a7fa8549d9b045facc3 (commit)
commit 3cd369280609cc0e1b3d4ea0be164897a323595d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Dec 12 17:40:41 2013 +0100
Make buttons in tabwin square and account for more x/ythickness in themes
Now themes with an x/ythickness of 3 should work fine, 3 might result in
cut labels
src/tabwin.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index f13f015..c5d8846 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -489,7 +489,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+app_label_height+10, icon_size+app_label_height+10);
buttonbox = gtk_vbox_new (FALSE, 0);
buttonlabel = gtk_label_new ();
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Small tabwin code improvements
Updating branch refs/heads/master
to 306ab75e13fa0c9c2696f6be8e2e3bf5f943bd13 (commit)
from a7c6c902153c86a99e92f38dee217d10bf45dadb (commit)
commit 306ab75e13fa0c9c2696f6be8e2e3bf5f943bd13
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Jul 15 09:32:06 2013 +0200
Small tabwin code improvements
src/tabwin.c | 27 +++
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index d0b4523..28d6ab0 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -110,7 +110,6 @@ get_color (GtkWidget *win, GtkStateType state_type)
static gboolean
tabwin_expose (GtkWidget *tbw, GdkEventExpose *event, gpointer data)
{
-GtkWindow *window;
GdkScreen *screen;
cairo_t *cr;
GdkColor *bg_normal = get_color(tbw, GTK_STATE_NORMAL);
@@ -119,14 +118,15 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
gdouble border_alpha = WIN_BORDER_ALPHA;
gdouble alpha = WIN_ALPHA;
gint border_radius = WIN_BORDER_RADIUS;
-double degrees = 3.14 / 180.0;
-double width = tbw-allocation.width;
-double height = tbw-allocation.height;
+gdouble degrees = 3.14 / 180.0;
+gdouble width = tbw-allocation.width;
+gdouble height = tbw-allocation.height;
-window = GTK_WINDOW(tbw);
-screen = gtk_window_get_screen(window);
screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
cr = gdk_cairo_create (tbw-window);
+if (G_UNLIKELY (cr == NULL))
+ return FALSE;
+
gtk_widget_style_get (GTK_WIDGET (tbw),
border-width, border_width,
border-alpha, border_alpha,
@@ -135,7 +135,7 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
NULL);
cairo_set_line_width (cr, border_width);
-if(gdk_screen_is_composited(screen)) {
+if (gdk_screen_is_composited(screen)) {
cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
gdk_cairo_region(cr, event-region);
cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.0);
@@ -143,7 +143,7 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
cairo_clip(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-//Draw a filled rounded rectangle with an outline
+/* Draw a filled rounded rectangle with an outline */
cairo_arc (cr, width - border_radius - 0.5, border_radius + 0.5,
border_radius, -90 * degrees, 0 * degrees);
cairo_arc (cr, width - border_radius - 0.5, height - border_radius -
0.5, border_radius, 0 * degrees, 90 * degrees);
cairo_arc (cr, border_radius + 0.5, height - border_radius - 0.5,
border_radius, 90 * degrees, 180 * degrees);
@@ -154,7 +154,7 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
cairo_set_source_rgba (cr, bg_selected-red/65535.0,
bg_selected-green/65535.0, bg_selected-blue/65535.0, border_alpha);
cairo_stroke (cr);
}
-else {
+else{
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_rectangle(cr, 0, 0, width, height);
gdk_cairo_set_source_color(cr, bg_normal);
@@ -250,9 +250,12 @@ tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w,
GtkWidget *l)
NULL);
c = g_object_get_data (G_OBJECT (tbw-selected), client-ptr-val);
-classname = g_strdup(c-class.res_class);
-tabwinSetLabel (tbw, l, classname, c-name, c-win_workspace);
-g_free (classname);
+if (c != NULL)
+{
+classname = g_strdup(c-class.res_class);
+tabwinSetLabel (tbw, l, classname, c-name, c-win_workspace);
+g_free (classname);
+}
}
static GtkWidget *
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix up default icon and bump png-icon-size to 64px Ensured it scales down to 48px very nicely, so it's better than scaling 48px up
Updating branch refs/heads/master to a7c6c902153c86a99e92f38dee217d10bf45dadb (commit) from d8856cde20775302f25c26ab5268bd22829faaf6 (commit) commit a7c6c902153c86a99e92f38dee217d10bf45dadb Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Jul 15 01:27:16 2013 +0200 Fix up default icon and bump png-icon-size to 64px Ensured it scales down to 48px very nicely, so it's better than scaling 48px up src/default_icon.png | Bin 1621 - 843 bytes src/default_icon.svg | 374 -- 2 files changed, 332 insertions(+), 42 deletions(-) diff --git a/src/default_icon.png b/src/default_icon.png index 27dddba..9b74d8d 100644 Binary files a/src/default_icon.png and b/src/default_icon.png differ diff --git a/src/default_icon.svg b/src/default_icon.svg index 8754f18..53ed5d7 100644 --- a/src/default_icon.svg +++ b/src/default_icon.svg @@ -1,5 +1,6 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? !-- Created with Inkscape (http://www.inkscape.org/) -- + svg xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:cc=http://creativecommons.org/ns#; @@ -13,7 +14,7 @@ height=480 id=svg2 sodipodi:version=0.32 - inkscape:version=0.46 + inkscape:version=0.48.4 r9939 version=1.0 sodipodi:docname=default_icon.svg inkscape:output_extension=org.inkscape.output.svg.inkscape @@ -195,6 +196,272 @@ stdDeviation=12.349741 id=feGaussianBlur3179 / /filter +linearGradient + inkscape:collect=always + xlink:href=#linearGradient3189 + id=linearGradient3783 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(1.1024436,0,0,0.67061094,-6.1136321,5.3003202) + x1=249.55844 + y1=117.35524 + x2=248.54829 + y2=179.9847 / +linearGradient + inkscape:collect=always + xlink:href=#linearGradient3189 + id=linearGradient3785 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(1.1024436,0,0,0.67061094,-6.1136321,5.3003202) + x1=248.54829 + y1=179.9847 + x2=249.55844 + y2=117.35524 / +linearGradient + inkscape:collect=always + xlink:href=#linearGradient3175 + id=linearGradient3788 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(1.1085371,0,0,1.1906609,-9.7135412,-49.472567) + x1=31.31473 + y1=187.05577 + x2=31.31473 + y2=390.09641 / +radialGradient + gradientTransform=matrix(1.5563924,0,0,0.16978827,70.27036,38.130286) + gradientUnits=userSpaceOnUse + xlink:href=#linearGradient3811 + id=radialGradient5831 + fy=93.467628 + fx=-4.0287771 + r=35.338131 + cy=93.467628 + cx=-4.0287771 / +linearGradient + id=linearGradient3811 + stop + offset=0 + style=stop-color:#00;stop-opacity:1 + id=stop3813 / + stop + offset=1 + style=stop-color:#00;stop-opacity:0 + id=stop3815 / +/linearGradient +linearGradient + id=linearGradient3702-501-757-0 + stop + offset=0 + style=stop-color:#181818;stop-opacity:0 + id=stop2895-0 / + stop + offset=0.5 + style=stop-color:#181818;stop-opacity:1 + id=stop2897-2-9 / + stop + offset=1 + style=stop-color:#181818;stop-opacity:0 + id=stop2899-6 / +/linearGradient +linearGradient + gradientUnits=userSpaceOnUse + xlink:href=#linearGradient3702-501-757-0 + id=linearGradient3360 + y2=39.999443 + x2=25.058096 + y1=47.027729 + x1=25.058096 / +linearGradient + id=linearGradient3688-464-309-8-0 + stop + offset=0 + style=stop-color:#181818;stop-opacity:1 + id=stop2889-9 / + stop + offset=1 + style=stop-color:#181818;stop-opacity:0 + id=stop2891-4-5 / +/linearGradient +radialGradient + gradientTransform=matrix(2.003784,0,0,1.4,-20.01187,-104.4) + gradientUnits=userSpaceOnUse + xlink:href=#linearGradient3688-464-309-8-0 + id=radialGradient3358 + fy=43.5 + fx=4.9929786 + r=2.5 + cy=43.5 + cx=4.9929786 / +linearGradient + id=linearGradient3688-166-749-5-0 + stop + offset=0 + style=stop-color:#181818;stop-opacity:1 + id=stop2883-0 / + stop + offset=1 + style=stop-color:#181818;stop-opacity:0 + id=stop2885-5 / +/linearGradient +radialGradient + gradientTransform=matrix(2.003784,0,0,1.4,27.98813,-17.4) + gradientUnits=userSpaceOnUse + xlink:href=#linearGradient3688-166-749-5-0 + id=radialGradient3356 + fy=43.5 + fx=4.9929786 + r=2.5 + cy=43.5 + cx=4.9929786 / +linearGradient + id=linearGradient3242 + stop + offset=0 +
[Xfce4-commits] xfwm4:master Make border-width property functional again
Updating branch refs/heads/master
to 2e9b0f00d3838b4bf84a5602b24f7bf68c130fa4 (commit)
from d9fd4483b8cd0d91cc32e0095d70ece745049edc (commit)
commit 2e9b0f00d3838b4bf84a5602b24f7bf68c130fa4
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jul 13 18:37:19 2013 +0200
Make border-width property functional again
src/tabwin.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 4d6431d..df8f47e 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -33,7 +33,7 @@
#endif
#ifndef WIN_COLOR_BORDER
-#define WIN_COLOR_BORDER 3
+#define WIN_COLOR_BORDER 1
#endif
#include glib.h
@@ -102,6 +102,7 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
GdkScreen *screen;
GdkColor *bg_normal = get_color(tbw, GTK_STATE_NORMAL);
GdkColor *bg_selected = get_color(tbw, GTK_STATE_SELECTED);
+gint border_width = WIN_COLOR_BORDER;
cairo_t *cr;
gint radius = 10.0;
double degrees = 3.14 / 180.0;
@@ -112,7 +113,8 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
screen = gtk_window_get_screen(window);
screen = gtk_widget_get_screen(GTK_WIDGET(tbw));
cr = gdk_cairo_create (tbw-window);
-cairo_set_line_width (cr, 1.0);
+gtk_widget_style_get (GTK_WIDGET (tbw), border-width, border_width,
NULL);
+cairo_set_line_width (cr, border_width);
if(gdk_screen_is_composited(screen)) {
cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
@@ -408,7 +410,6 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
GtkWidget *vbox;
GtkWidget *windowlist;
GdkRectangle monitor;
-gint border_width = WIN_COLOR_BORDER;
TRACE (entering tabwinCreateWidget for monitor %i, monitor_num);
@@ -421,7 +422,6 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
tbw-selected = NULL;
tbw-selected_callback = 0;
-gtk_widget_style_get (GTK_WIDGET (tbw), border-width, border_width,
NULL);
gtk_window_set_screen (GTK_WINDOW (tbw), screen_info-gscr);
gtk_widget_set_name (GTK_WIDGET (tbw), xfwm4-tabwin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Tabwin buttons are clickable
Updating branch refs/heads/master
to 1fd1b311af442d85b57e275fec5b45cac0776981 (commit)
from 7c87af29befcc91ba2e890dd822a4a69cb3263d9 (commit)
commit 1fd1b311af442d85b57e275fec5b45cac0776981
Author: Eric Koegel eric.koe...@gmail.com
Date: Tue Nov 19 06:50:52 2013 +0300
Tabwin buttons are clickable
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 50 ++---
src/tabwin.c | 59 +-
src/tabwin.h |1 +
3 files changed, 86 insertions(+), 24 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 6913ff4..d405d9b 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -361,14 +361,11 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
break;
case ButtonPress:
case ButtonRelease:
+status = EVENT_FILTER_CONTINUE;
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
break;
-case EnterNotify:
-case LeaveNotify:
-/* window of the event, we might accept it later */
-mouse_window = xevent-xcrossing.window;
-break;
+
default:
status = EVENT_FILTER_CONTINUE;
break;
@@ -376,13 +373,39 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
if (mouse_window != 0)
{
+Client *c2 = NULL;
+
/* only accept events for the tab windows */
for (li = passdata-tabwin-tabwin_list; li != NULL; li = li-next)
+{
if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
{
-status = EVENT_FILTER_CONTINUE;
+c2 = tabwinSelectWidget (passdata-tabwin, li-data);
+if (c2)
+{
+c = c2;
+}
+
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
+{
+cycling = FALSE;
+}
break;
}
+}
+
+if (c2 == NULL)
+{
+status = EVENT_FILTER_STOP;
+cycling = FALSE;
+}
}
if (!cycling)
@@ -391,6 +414,14 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
gtk_main_quit ();
}
+if (status == EVENT_FILTER_STOP)
+{
+/* If there's any chance of a leftover grab, release it. This happens
+ * when the user clicks outside of the tabwin window area onto another
+ * window */
+myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+}
+
return status;
}
@@ -401,7 +432,7 @@ clientCycle (Client * c, XKeyEvent * ev)
DisplayInfo *display_info;
ClientCycleData passdata;
GList *client_list, *selected;
-gboolean g1, g2;
+gboolean g1;
int key, modifier;
Client *c2;
@@ -448,15 +479,13 @@ clientCycle (Client * c, XKeyEvent * ev)
}
g1 = myScreenGrabKeyboard (screen_info, ev-time);
-g2 = myScreenGrabPointer (screen_info, EnterWindowMask | LeaveWindowMask |
ButtonPressMask | ButtonMotionMask | PointerMotionMask | ButtonReleaseMask,
None, ev-time);
-if (!g1 || !g2)
+if (!g1)
{
TRACE (grab failed in clientCycle);
gdk_beep ();
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
g_list_free (client_list);
return;
@@ -496,7 +525,6 @@ clientCycle (Client * c, XKeyEvent * ev)
g_list_free (client_list);
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
}
gboolean
diff --git a/src/tabwin.c b/src/tabwin.c
index bad1e56..747ec2f 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -365,6 +365,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
{
selected = window_button;
selected_label = buttonlabel;
+gtk_widget_grab_focus (selected);
}
}
if (selected)
@@ -493,20 +494,12 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
gtk_label_set_use_markup (GTK_LABEL (tbw-label), TRUE);
gtk_label_set_justify (GTK_LABEL (tbw-label), GTK_JUSTIFY_CENTER);
gtk_label_set_ellipsize (GTK_LABEL (tbw-label), PANGO_ELLIPSIZE_END);
-//gtk_widget_set_size_request (GTK_WIDGET (tbw-label), 240, -1);
gtk_box_pack_end (GTK_BOX (vbox), tbw-label, TRUE, TRUE, 0);
windowlist = createWindowlist (screen_info, tbw);
tbw-container = windowlist;
[Xfce4-commits] garcon:master Updates for release.
Updating branch refs/heads/master to 69ff09cf0a9ee3ff9518822614637dc2d4f89ce6 (commit) from c13c85b5cd4ae277bfe9b9441c277a3deff15c23 (commit) commit 69ff09cf0a9ee3ff9518822614637dc2d4f89ce6 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:26:28 2014 +0100 Updates for release. NEWS| 17 + configure.ac.in |2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 95ab343..405aadf 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +0.3.0 += +- Avoid direct include of garcon-menu.h. +- Add garcon_set_environment_xdg() function. +- Add a garcon-gtk library for common gtk functions. +- Bail out of creating a directory menu if it doesn't have a name. +- Translation updates: Arabic, Bulgarian, Catalan (Valencian), Czech, + Danish, German, Greek, English (Australia), English (United Kingdom), + Esperanto, Spanish (Castilian), Estonian, Basque, Finnish, French, + Galician, Hebrew, Croatian, Hungarian, Indonesian, Icelandic, + Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian + Bokmal, Dutch (Flemish), Norwegian Nynorsk, Occitan (post 1500), + Polish, Portuguese, Portuguese (Brazilian), Romanian, Russian, + Slovenian, Albanian, Serbian, Swedish, Telugu, Thai, Turkish, Uyghur, + Ukrainian, Urdu, Chinese (China), Chinese (Hong Kong), Chinese + (Taiwan). + 0.2.1 = - g_thread_init is deprecated since glib 2.32. diff --git a/configure.ac.in b/configure.ac.in index 6073729..f2a0b54 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -26,7 +26,7 @@ m4_define([garcon_version_major], [0]) m4_define([garcon_version_minor], [3]) m4_define([garcon_version_micro], [0]) m4_define([garcon_version_build], [@REVISION@]) -m4_define([garcon_version_tag], [git]) +m4_define([garcon_version_tag], []) m4_define([garcon_version], [garcon_version_major().garcon_version_minor().garcon_version_micro()ifelse(garcon_version_tag(), [git], [garcon_version_tag()-garcon_version_build()], [garcon_version_tag()])]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon|garcon-0.3.0 Creating annotated tag garcon-0.3.0
Updating annotated tag refs/tags/garcon-0.3.0 as new annotated tag to 9e0e19994ff97cbbedc7473b421f55b5323a0810 (tag) succeeds garcon-0.2.1-70-gc13c85b tagged by Nick Schermer n...@xfce.org on 2014-02-22 23:26 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Post release tag bump.
Updating branch refs/heads/master to 43a72cc5eb60acc977720066e63d4cb8f101cb85 (commit) from 69ff09cf0a9ee3ff9518822614637dc2d4f89ce6 (commit) commit 43a72cc5eb60acc977720066e63d4cb8f101cb85 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:27:39 2014 +0100 Post release tag bump. configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index f2a0b54..6073729 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -26,7 +26,7 @@ m4_define([garcon_version_major], [0]) m4_define([garcon_version_minor], [3]) m4_define([garcon_version_micro], [0]) m4_define([garcon_version_build], [@REVISION@]) -m4_define([garcon_version_tag], []) +m4_define([garcon_version_tag], [git]) m4_define([garcon_version], [garcon_version_major().garcon_version_minor().garcon_version_micro()ifelse(garcon_version_tag(), [git], [garcon_version_tag()-garcon_version_build()], [garcon_version_tag()])]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Updates for release.
Updating branch refs/heads/master to 83cc23d03e9ab732c53deaaa9b7d7811eb3de005 (commit) from 87afbc3ee82715ac50a21515a4da67a8294b8fcb (commit) commit 83cc23d03e9ab732c53deaaa9b7d7811eb3de005 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:31:20 2014 +0100 Updates for release. NEWS|8 +++- configure.ac.in |4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index ef41ed9..d6d2d41 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,13 @@ -4.11.x +4.11.1 == - Add xfce_dialog_show_help_with_version() so applications can send their own version number and not the desktop version. +- Translation updates: Arabic, Bulgarian, Bengali, Danish, German, + Greek, Finnish, Galician, Croatian, Icelandic, Japanese, Kazakh, + Korean, Lithuanian, Malay, Norwegian Bokmal, Norwegian Nynorsk, + Occitan (post 1500), Portuguese, Portuguese (Brazilian), Romanian, + Russian, Slovak, Slovenian, Serbian, Telugu, Ukrainian, Chinese + (China), Chinese (Hong Kong), Chinese (Taiwan). 4.11.0 == diff --git a/configure.ac.in b/configure.ac.in index 664593d..5a47267 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,10 +10,10 @@ m4_define([libxfce4ui_verinfo], [0:0:0]) m4_define([libxfce4ui_version_api], [1]) m4_define([libxfce4ui_version_major], [4]) m4_define([libxfce4ui_version_minor], [11]) -m4_define([libxfce4ui_version_micro], [0]) +m4_define([libxfce4ui_version_micro], [1]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4ui_version_build], [@REVISION@]) -m4_define([libxfce4ui_version_tag], [git]) +m4_define([libxfce4ui_version_tag], []) m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) m4_define([libxfce4kbd_private_verinfo], [0:0:0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Post release tag bump
Updating branch refs/heads/master to 46ad184caa4c806125a2dd3794fb27c8c674c955 (commit) from 83cc23d03e9ab732c53deaaa9b7d7811eb3de005 (commit) commit 46ad184caa4c806125a2dd3794fb27c8c674c955 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:36:11 2014 +0100 Post release tag bump configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 5a47267..4aea844 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ m4_define([libxfce4ui_version_minor], [11]) m4_define([libxfce4ui_version_micro], [1]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4ui_version_build], [@REVISION@]) -m4_define([libxfce4ui_version_tag], []) +m4_define([libxfce4ui_version_tag], [git]) m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) m4_define([libxfce4kbd_private_verinfo], [0:0:0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui|libxfce4ui-4.11.1 Creating annotated tag libxfce4ui-4.11.1
Updating annotated tag refs/tags/libxfce4ui-4.11.1 as new annotated tag to 7c37663eab9ddadc8b04559d8258a19f2a0b1a50 (tag) succeeds libxfce4ui-4.11.0-35-g87afbc3 tagged by Nick Schermer n...@xfce.org on 2014-02-22 23:32 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util|libxfce4util-4.11.0 Creating annotated tag libxfce4util-4.11.0
Updating annotated tag refs/tags/libxfce4util-4.11.0 as new annotated tag to 5f56641e09b081f7d76d3f307589b21840c1 (tag) succeeds libxfce4util-4.10.0-22-gb61bf31 tagged by Nick Schermer n...@xfce.org on 2014-02-22 23:41 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Post release tag bump
Updating branch refs/heads/master to fe024f4b310806daea025681bc896fbed45212ee (commit) from 717be39f44594fa012a625d562f5397b14892858 (commit) commit fe024f4b310806daea025681bc896fbed45212ee Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:40:26 2014 +0100 Post release tag bump configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 1314980..e2861de 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -16,7 +16,7 @@ m4_define([libxfce4util_version_minor], [11]) m4_define([libxfce4util_version_micro], [0]) m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [@REVISION@]) -m4_define([libxfce4util_version_tag], []) +m4_define([libxfce4util_version_tag], [git]) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Updates for release.
Updating branch refs/heads/master to 717be39f44594fa012a625d562f5397b14892858 (commit) from b61bf316f73e886934a7d66309f312a8d3d11b51 (commit) commit 717be39f44594fa012a625d562f5397b14892858 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:38:34 2014 +0100 Updates for release. NEWS| 11 +++ configure.ac.in |4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5f5e2ee..765d904 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +4.11.0 +== +- Autotools updates. +- Don't use freed rc file to avoid crash (bug #9026). +- Remove unused or unrequired API functions: xfce_strjoin, + xfce_gethostname, xfce_putenv, xfce_setenv, xfce_unsetenv. +- Translation updates: Arabic, Bulgarian, Welsh, Dzongkha, English + (Australia), Georgian, Korean, Macedonian, Malay, Dutch (Flemish), + Occitan (post 1500), Slovenian, Serbian, Thai, Tagalog (Philippines), + Uyghur, Chinese (Hong Kong). + 4.10.0 == - Translation updates: Romanian, Chinese (China). diff --git a/configure.ac.in b/configure.ac.in index 41aceff..1314980 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,11 +12,11 @@ dnl *** Version information *** dnl *** m4_define([libxfce4util_verinfo], [6:0:0]) m4_define([libxfce4util_version_major], [4]) -m4_define([libxfce4util_version_minor], [10]) +m4_define([libxfce4util_version_minor], [11]) m4_define([libxfce4util_version_micro], [0]) m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [@REVISION@]) -m4_define([libxfce4util_version_tag], [git]) +m4_define([libxfce4util_version_tag], []) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master Post release tag bump
Updating branch refs/heads/master to 08e07606ccc2e179d3dfa0e43f945afe0248d6d0 (commit) from 6c2bc7a09dd6e85bb78913cdc8af2292a9361e04 (commit) commit 08e07606ccc2e179d3dfa0e43f945afe0248d6d0 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:47:55 2014 +0100 Post release tag bump configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 552d5e8..be91ee6 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,7 +10,7 @@ m4_define([xfce4_appfinder_version_minor], [11]) m4_define([xfce4_appfinder_version_micro], [0]) m4_define([xfce4_appfinder_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_appfinder_version_build], [@REVISION@]) -m4_define([xfce4_appfinder_version_tag], []) +m4_define([xfce4_appfinder_version_tag], [git]) m4_define([xfce4_appfinder_version], [xfce4_appfinder_version_major().xfce4_appfinder_version_minor().xfce4_appfinder_version_micro()ifelse(xfce4_appfinder_version_nano(), [], [], [.xfce4_appfinder_version_nano()])ifelse(xfce4_appfinder_version_tag(), [git], [xfce4_appfinder_version_tag()-xfce4_appfinder_version_build()], [xfce4_appfinder_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master Updates for release.
Updating branch refs/heads/master to 6c2bc7a09dd6e85bb78913cdc8af2292a9361e04 (commit) from 4c573a8167b068be0f3a7088140f304317b404df (commit) commit 6c2bc7a09dd6e85bb78913cdc8af2292a9361e04 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:46:33 2014 +0100 Updates for release. NEWS| 35 --- configure.ac.in |4 ++-- po/POTFILES.in |1 + 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index b6b984e..dade337 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,24 @@ +4.11.0 +== +- Make compilation to GTK3 optional. +- Use GDbus for communication. +- Add execute menu item to launch without closing the window. +- Add default action to open absolute paths. +- Add bookmarks in the model. +- Do nothing with the Tab event during competion (bug #10187). +- Use new xdg function to set environment. +- Translation updates: Amharic, Arabic, Belarusian, Bulgarian, + Bengali (India), Catalan (Valencian), Czech, Danish, German, + Dzongkha, Greek, English (Australia), English (United Kingdom), + Spanish (Castilian), Estonian, Basque, Persian, Finnish, French, + Galician, Gujarati, Croatian, Hungarian, Armenian, Indonesian, + Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, Kurdish, + Lithuanian, Macedonian, Marathi, Malay, Dutch (Flemish), Norwegian + Nynorsk, Occitan (post 1500), Polish, Portuguese, Portuguese + (Brazilian), Romanian, Russian, Slovak, Slovenian, Serbian, Swedish, + Thai, Turkish, Uyghur, Ukrainian, Chinese (China), Chinese (Hong + Kong), Chinese (Taiwan). + 4.10.0 == - Add a valid category to xfce4-run.desktop. @@ -6,9 +27,9 @@ - Avoid segfault when right-clicking a custom command. - Only focus view if an item is selected on entry active. - Try to spwan a custom command in expanded view as well. -- Translation updates: Czech, German, English (United Kingdom), - Spanish (Castilian), Galician, Hungarian, Japanese, Korean, Dutch - (Flemish), Portuguese (Brazilian), Romanian, Turkish, Chinese +- Translation updates: Czech, German, English (United Kingdom), + Spanish (Castilian), Galician, Hungarian, Japanese, Korean, Dutch + (Flemish), Portuguese (Brazilian), Romanian, Turkish, Chinese (China), Chinese (Taiwan). 4.9.5 @@ -16,10 +37,10 @@ - Don't use deprecated g_mapped_file_free (bug #8649). - Bump gtk, glib and xfce dependencies. - Make launch button translatable. -- Translation updates: Catalan (Valencian), Danish, German, Greek, - Basque, Finnish, French, Galician, Croatian, Italian, Japanese, - Kazakh, Korean, Lithuanian, Dutch (Flemish), Norwegian Nynorsk, - Polish, Portuguese, Portuguese (Brazilian), Russian, Slovak, Turkish, +- Translation updates: Catalan (Valencian), Danish, German, Greek, + Basque, Finnish, French, Galician, Croatian, Italian, Japanese, + Kazakh, Korean, Lithuanian, Dutch (Flemish), Norwegian Nynorsk, + Polish, Portuguese, Portuguese (Brazilian), Russian, Slovak, Turkish, Ukrainian, Chinese (China). 4.9.4 diff --git a/configure.ac.in b/configure.ac.in index a0dc536..552d5e8 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,11 +6,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([xfce4_appfinder_version_major], [4]) -m4_define([xfce4_appfinder_version_minor], [10]) +m4_define([xfce4_appfinder_version_minor], [11]) m4_define([xfce4_appfinder_version_micro], [0]) m4_define([xfce4_appfinder_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_appfinder_version_build], [@REVISION@]) -m4_define([xfce4_appfinder_version_tag], [git]) +m4_define([xfce4_appfinder_version_tag], []) m4_define([xfce4_appfinder_version], [xfce4_appfinder_version_major().xfce4_appfinder_version_minor().xfce4_appfinder_version_micro()ifelse(xfce4_appfinder_version_nano(), [], [], [.xfce4_appfinder_version_nano()])ifelse(xfce4_appfinder_version_tag(), [git], [xfce4_appfinder_version_tag()-xfce4_appfinder_version_build()], [xfce4_appfinder_version_tag()])]) dnl *** diff --git a/po/POTFILES.in b/po/POTFILES.in index 622da8a..a7fe997 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,5 @@ +src/appfinder-gdbus.c src/appfinder-actions.c src/appfinder-category-model.c src/appfinder-model.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder|xfce4-appfinder-4.11.0 Creating annotated tag xfce4-appfinder-4.11.0
Updating annotated tag refs/tags/xfce4-appfinder-4.11.0 as new annotated tag to 526b9e90e678be8a8cb11539aa45a8fbba8fb123 (tag) succeeds xfce4-appfinder-4.10.0-101-g4c573a8 tagged by Nick Schermer n...@xfce.org on 2014-02-22 23:47 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-dev-tools:master Updates for release.
Updating branch refs/heads/master to f574099ea0bb60bed7ee8f007edf66b1f86271f4 (commit) from b94af0c78a6509888368fbd4d280372eee1f7dab (commit) commit f574099ea0bb60bed7ee8f007edf66b1f86271f4 Author: Nick Schermer n...@xfce.org Date: Sat Feb 22 23:51:08 2014 +0100 Updates for release. NEWS|7 +++ configure.ac.in |4 ++-- module.xml | 28 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/NEWS b/NEWS index 002e503..93d007d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.11.0 +== +- Remove FORTIFY_SOURCE=2. +- Some build improvements. +- Correctly quote AC_COMPILE_IFELSE macro. +- Avoid gnu_printf warnings in debugging in gcc 4.8. + 4.10.0 == - Bump version. diff --git a/configure.ac.in b/configure.ac.in index 73be5b4..654b1d1 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,11 +10,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([xdt_version_major], [4]) -m4_define([xdt_version_minor], [10]) +m4_define([xdt_version_minor], [11]) m4_define([xdt_version_micro], [0]) m4_define([xdt_version_nano], []) m4_define([xdt_version_build], [@REVISION@]) -m4_define([xdt_version_tag], [git]) +m4_define([xdt_version_tag], []) m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()ifelse(xdt_version_nano(), [], [], [.xdt_version_nano()])ifelse(xdt_version_tag(), [git], [xdt_version_tag()-xdt_version_build()], [])]) diff --git a/module.xml b/module.xml deleted file mode 100644 index cf5b7f7..000 --- a/module.xml +++ /dev/null @@ -1,28 +0,0 @@ -?xml version='1.0' encoding='UTF-8'? -Project xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#; - xmlns:foaf=http://xmlns.com/foaf/0.1/; - xmlns:gnome=http://api.gnome.org/doap-extensions#; - xmlns=http://usefulinc.com/ns/doap#; - - name xml:lang=enxfce4-dev-tools/name - shortdesc xml:lang=enAutoconf macros and scripts to augment app build systems/shortdesc - homepage rdf:resource=http://xfce.org/ - mailing-list rdf:resource=http://foo-projects.org/mailmain/listinfo/xfce4-dev/ - - maintainer -foaf:Person - foaf:nameBrian Tarricone/foaf:name - foaf:mboxmailto:kel...@xfce.org/foaf:mbox - gnome:useridkelnos/gnome:userid -/foaf:Person - /maintainer - - developer -foaf:Person - foaf:nameBenedikt Meurer/foaf:name - foaf:mboxmailto:be...@xfce.org/foaf:mbox - gnome:useridbenny/gnome:userid -/foaf:Person - /developer -/Project ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-dev-tools|xfce4-dev-tools-4.11.0 Creating annotated tag xfce4-dev-tools-4.11.0
Updating annotated tag refs/tags/xfce4-dev-tools-4.11.0 as new annotated tag to cc2c918a97318197ac6bf8195a6b3544c15e5183 (tag) succeeds xfce4-dev-tools-4.10.0-5-gb94af0c tagged by Nick Schermer n...@xfce.org on 2014-02-22 23:51 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master Post release tag bump.
Updating branch refs/heads/master to 8f03ecaee53ec950e9a4590fcbc5fbb219fdee4d (commit) from bc8305461cf9cc806c0396aa6dcfd6a508da29ec (commit) commit 8f03ecaee53ec950e9a4590fcbc5fbb219fdee4d Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:02:44 2014 +0100 Post release tag bump. configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index d2bfa49..910fd35 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ m4_define([xfsm_version_minor], [11]) m4_define([xfsm_version_micro], [0]) m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version m4_define([xfsm_version_build], [@REVISION@]) -m4_define([xfsm_version_tag], []) +m4_define([xfsm_version_tag], [git]) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master Updates for release.
Updating branch refs/heads/master to bc8305461cf9cc806c0396aa6dcfd6a508da29ec (commit) from 54f970f8162c5e3fe246d4863309b1ffdd3de7d1 (commit) commit bc8305461cf9cc806c0396aa6dcfd6a508da29ec Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:01:37 2014 +0100 Updates for release. NEWS| 21 + configure.ac.in |4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1596d1c..8c189cf 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,24 @@ +4.11.0 +== +- Remove gnome-keyring remains. +- Remove xfce environment functions and use glib. +- Add shutdown/reboot functionality for systemd (bug #8729). +- Fix duplicated accelerators. +- Use the async spawn function of glib. +- Store the watch function id to avoid possible double free (bug #9709). +- Translation updates: Amharic, Arabic, Asturian, Azerbaijani, + Belarusian, Bulgarian, Bengali, Bengali (India), Catalan (Valencian), + Czech, Danish, German, Dzongkha, Greek, English (Australia), English + (United Kingdom), Spanish (Castilian), Basque, Persian, Finnish, + French, Galician, Gujarati, Hindi, Croatian, Hungarian, Indonesian, + Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, Lithuanian, + Latvian, Macedonian, Marathi, Malay, Norwegian Bokmal, Dutch + (Flemish), Norwegian Nynorsk, Occitan (post 1500), Polish, + Portuguese, Portuguese (Brazilian), Romanian, Russian, Slovak, + Albanian, Serbian, Swedish, Tamil, Thai, Turkish, Uyghur, Ukrainian, + Urdu, Urdu (Pakistan), Chinese (China), Chinese (Hong Kong), Chinese + (Taiwan). + 4.10.0 == - Remove remaining code to shutdown gconf. diff --git a/configure.ac.in b/configure.ac.in index 46ff366..d2bfa49 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,11 +7,11 @@ dnl dnl Version information m4_define([xfsm_version_major], [4]) -m4_define([xfsm_version_minor], [10]) +m4_define([xfsm_version_minor], [11]) m4_define([xfsm_version_micro], [0]) m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version m4_define([xfsm_version_build], [@REVISION@]) -m4_define([xfsm_version_tag], [git]) +m4_define([xfsm_version_tag], []) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session|xfce4-session-4.11.0 Creating annotated tag xfce4-session-4.11.0
Updating annotated tag refs/tags/xfce4-session-4.11.0 as new annotated tag to f1009d2c2c468216270dea0d4753ef060d424c28 (tag) succeeds xfce4-session-4.10.0-129-g54f970f tagged by Nick Schermer n...@xfce.org on 2014-02-23 00:02 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master Strip spaces.
Updating branch refs/heads/master to 15b1cc116cc6edfac15323fe90c82bde6d91e960 (commit) from 8f03ecaee53ec950e9a4590fcbc5fbb219fdee4d (commit) commit 15b1cc116cc6edfac15323fe90c82bde6d91e960 Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:04:12 2014 +0100 Strip spaces. NEWS | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index 8c189cf..e039bbe 100644 --- a/NEWS +++ b/NEWS @@ -6,17 +6,17 @@ - Fix duplicated accelerators. - Use the async spawn function of glib. - Store the watch function id to avoid possible double free (bug #9709). -- Translation updates: Amharic, Arabic, Asturian, Azerbaijani, - Belarusian, Bulgarian, Bengali, Bengali (India), Catalan (Valencian), - Czech, Danish, German, Dzongkha, Greek, English (Australia), English - (United Kingdom), Spanish (Castilian), Basque, Persian, Finnish, - French, Galician, Gujarati, Hindi, Croatian, Hungarian, Indonesian, - Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, Lithuanian, - Latvian, Macedonian, Marathi, Malay, Norwegian Bokmal, Dutch - (Flemish), Norwegian Nynorsk, Occitan (post 1500), Polish, - Portuguese, Portuguese (Brazilian), Romanian, Russian, Slovak, - Albanian, Serbian, Swedish, Tamil, Thai, Turkish, Uyghur, Ukrainian, - Urdu, Urdu (Pakistan), Chinese (China), Chinese (Hong Kong), Chinese +- Translation updates: Amharic, Arabic, Asturian, Azerbaijani, + Belarusian, Bulgarian, Bengali, Bengali (India), Catalan (Valencian), + Czech, Danish, German, Dzongkha, Greek, English (Australia), English + (United Kingdom), Spanish (Castilian), Basque, Persian, Finnish, + French, Galician, Gujarati, Hindi, Croatian, Hungarian, Indonesian, + Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, Lithuanian, + Latvian, Macedonian, Marathi, Malay, Norwegian Bokmal, Dutch + (Flemish), Norwegian Nynorsk, Occitan (post 1500), Polish, + Portuguese, Portuguese (Brazilian), Romanian, Russian, Slovak, + Albanian, Serbian, Swedish, Tamil, Thai, Turkish, Uyghur, Ukrainian, + Urdu, Urdu (Pakistan), Chinese (China), Chinese (Hong Kong), Chinese (Taiwan). 4.10.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings|xfce4-settings-4.11.2 Creating annotated tag xfce4-settings-4.11.2
Updating annotated tag refs/tags/xfce4-settings-4.11.2 as new annotated tag to 3bc797008df93235bf745878de8eac58e461e03e (tag) succeeds xfce4-settings-4.11.1-71-g12788c5 tagged by Nick Schermer n...@xfce.org on 2014-02-23 00:09 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Post release tag bump.
Updating branch refs/heads/master to acb84157b1eafdc2d1ac051e549e1d7dd4403d6b (commit) from e329018189663837f2cd9c50807e4376a852cc88 (commit) commit acb84157b1eafdc2d1ac051e549e1d7dd4403d6b Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:08:03 2014 +0100 Post release tag bump. configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 62f0998..7305df2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -14,7 +14,7 @@ m4_define([xfce4_settings_version_minor], [11]) m4_define([xfce4_settings_version_micro], [2]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], []) # Leave empty for releases +m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Updates for release.
Updating branch refs/heads/master to e329018189663837f2cd9c50807e4376a852cc88 (commit) from 12788c5792784551a70f166de509b1483f73f269 (commit) commit e329018189663837f2cd9c50807e4376a852cc88 Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:06:23 2014 +0100 Updates for release. NEWS| 16 configure.ac.in |4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index df9869e..a21edd4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +4.11.2 +== +- Increase double click time to 400ms (bug #10562). +- Show/hide display popups with focus. +- Add hotplug checkbox to plug dialog. +- Identify Displays button. +- Fix display mirroring. +- Make mirror button insensitive if not possible. +- Translation updates: Arabic, Bengali, Danish, German, Greek, + English (United Kingdom), Basque, Finnish, Galician, Hebrew, + Croatian, Hungarian, Indonesian, Icelandic, Japanese, Kazakh, + Lithuanian, Norwegian Bokmal, Norwegian Nynorsk, Occitan (post 1500), + Polish, Portuguese, Portuguese (Brazilian), Romanian, Slovak, + Serbian, Swedish, Turkish, Ukrainian, Chinese (China), Chinese (Hong + Kong). + 4.11.1 == - Automatically re-enable Laptop-displays if all other displays diff --git a/configure.ac.in b/configure.ac.in index b3d502b..62f0998 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,10 +11,10 @@ dnl *** Version information *** dnl *** m4_define([xfce4_settings_version_major], [4]) m4_define([xfce4_settings_version_minor], [11]) -m4_define([xfce4_settings_version_micro], [1]) +m4_define([xfce4_settings_version_micro], [2]) m4_define([xfce4_settings_version_nano], []) m4_define([xfce4_settings_version_build], [@REVISION@]) -m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases +m4_define([xfce4_settings_version_tag], []) # Leave empty for releases m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler|tumbler-0.1.30 Creating annotated tag tumbler-0.1.30
Updating annotated tag refs/tags/tumbler-0.1.30 as new annotated tag to 56dc125f1e1c8fe8e4408304629dd15979b9c5f5 (tag) succeeds tumbler-0.1.29-68-g7506f84 tagged by Nick Schermer n...@xfce.org on 2014-02-23 00:15 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Updates for release.
Updating branch refs/heads/master to 073c2080c79075fdf574064fa2098c4b5bb79a11 (commit) from 7506f8464605ad60031aa8c25924077dd77dba76 (commit) commit 073c2080c79075fdf574064fa2098c4b5bb79a11 Author: Nick Schermer n...@xfce.org Date: Sun Feb 23 00:12:51 2014 +0100 Updates for release. NEWS| 17 - configure.ac|2 +- docs/reference/tumbler/tumbler-docs.xml |1 - 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 415f1b6..78bbb77 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +0.1.30 +== +- Only enable keepalive in curl = 7.25. +- Support move/copy operations on directories in the cache. +- Send the cache operation replies after they are completed. +- Translation updates: Arabic, Asturian, Bulgarian, Bengali, Catalan + (Valencian), Czech, Danish, German, Greek, English (Australia), + English (United Kingdom), Spanish (Castilian), Basque, Finnish, + French, Galician, Hebrew, Hungarian, Indonesian, Italian, Japanese, + Kazakh, Korean, Lithuanian, Latvian, Malay, Norwegian Bokmal, Dutch + (Flemish), Norwegian Nynorsk, Occitan (post 1500), Polish, + Portuguese, Portuguese (Brazilian), Romanian, Russian, Slovak, + Swedish, Thai, Turkish, Uyghur, Ukrainian, Chinese (China), Chinese + (Hong Kong), Chinese (Taiwan). + 0.1.29 == - Fix memory corruption on 64bit (bug #9766). @@ -45,7 +60,7 @@ - Make registry dump a bit smaller. - Don't use deprecated glib 2.32 API. - Rotate pixbuf loader images (bug #6730). -- Translation updates: Arabic, Spanish (Castilian), Icelandic, +- Translation updates: Arabic, Spanish (Castilian), Icelandic, Korean, Dutch (Flemish), Serbian, Uyghur. 0.1.25 diff --git a/configure.ac b/configure.ac index b4acf47..75e3879 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ m4_define([tumbler_verinfo], [0:0:0]) m4_define([tumbler_version_api_major], [1]) m4_define([tumbler_version_major], [0]) m4_define([tumbler_version_minor], [1]) -m4_define([tumbler_version_micro], [29]) +m4_define([tumbler_version_micro], [30]) m4_define([tumbler_version], [tumbler_version_major().tumbler_version_minor().tumbler_version_micro()]) dnl *** diff --git a/docs/reference/tumbler/tumbler-docs.xml b/docs/reference/tumbler/tumbler-docs.xml index 6ab89c2..f38cd8a 100644 --- a/docs/reference/tumbler/tumbler-docs.xml +++ b/docs/reference/tumbler/tumbler-docs.xml @@ -88,7 +88,6 @@ xi:include href=xml/tumbler-provider-factory.xml/ xi:include href=xml/tumbler-provider-plugin.xml/ xi:include href=xml/tumbler-abstract-thumbnailer.xml/ -xi:include href=xml/tumbler-cache-provider.xml/ xi:include href=xml/tumbler-thumbnailer-provider.xml/ /part ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] wiki:master Support versions in docs.
Updating branch refs/heads/master
to 4d2f0a6d6ef6ec80149d22eb022384181ca601ea (commit)
from eb9b4885a974398cd0f517f3bfb7f6a9fb86d23f (commit)
commit 4d2f0a6d6ef6ec80149d22eb022384181ca601ea
Author: Nick Schermer n...@xfce.org
Date: Sun Feb 16 22:47:37 2014 +0100
Support versions in docs.
help.php | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/help.php b/help.php
index 47e5b6e..2e79a31 100644
--- a/help.php
+++ b/help.php
@@ -19,7 +19,7 @@ if (!is_dir ($root) || !chdir (($root)))
die ('Pages path is not properly configured');
/* Get information about from the uri */
-//$version = get_value ('version');
+$version = get_value ('version');
$locale = get_value ('locale');
$component = get_value ('component');
$page = get_value ('page', $defpage);
@@ -42,7 +42,13 @@ if (!empty ($component))
foreach ($subdirs as $subdir)
{
$path = $subdir.'/'.$component.'/';
-if (is_dir ($path))
+$version_path = $path.$version.'/';
+if (is_dir ($version_path))
+{
+$uri = $version_path;
+break;
+}
+elseif (is_dir ($path))
{
$uri = $path;
break;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Add xfce_dialog_show_help_with_version().
Updating branch refs/heads/master
to d5467df1c64ff6cf6884cd7347a3c8c62c49b32e (commit)
from 835861af91de444561b7c0de420332de68d32587 (commit)
commit d5467df1c64ff6cf6884cd7347a3c8c62c49b32e
Author: Nick Schermer n...@xfce.org
Date: Sun Feb 16 23:01:19 2014 +0100
Add xfce_dialog_show_help_with_version().
Allow applications to send their own version string to the wiki
help.php script.
NEWS |5 ++
docs/libxfce4ui-sections.txt |1 +
libxfce4ui/libxfce4ui.symbols |1 +
libxfce4ui/xfce-dialogs.c | 41 +++-
libxfce4ui/xfce-dialogs.h | 106 ++---
5 files changed, 103 insertions(+), 51 deletions(-)
diff --git a/NEWS b/NEWS
index 6f3e323..ef41ed9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+4.11.x
+==
+- Add xfce_dialog_show_help_with_version() so applications can send
+ their own version number and not the desktop version.
+
4.11.0
==
- Compile GTK+-3 version of libxfce4ui when possible.
diff --git a/docs/libxfce4ui-sections.txt b/docs/libxfce4ui-sections.txt
index 7df732f..e7b7459 100644
--- a/docs/libxfce4ui-sections.txt
+++ b/docs/libxfce4ui-sections.txt
@@ -39,6 +39,7 @@ xfce_message_dialog_new
xfce_message_dialog_new_valist
xfce_message_dialog
xfce_dialog_show_help
+xfce_dialog_show_help_with_version
xfce_dialog_show_info
xfce_dialog_show_warning
xfce_dialog_show_error
diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
index f572f23..e054f5f 100644
--- a/libxfce4ui/libxfce4ui.symbols
+++ b/libxfce4ui/libxfce4ui.symbols
@@ -58,6 +58,7 @@ xfce_sm_client_shutdown_hint_get_type
#if IN_HEADER(__XFCE_DIALOGS_H__)
#if IN_SOURCE(__XFCE_DIALOGS_C__)
xfce_dialog_show_help
+xfce_dialog_show_help_with_version
xfce_dialog_show_info G_GNUC_PRINTF (3, 4)
xfce_dialog_show_warning G_GNUC_PRINTF (3, 4)
xfce_dialog_show_error G_GNUC_PRINTF (3, 4)
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 762b610..ca7a9b8 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -142,6 +142,8 @@ xfce_dialog_show_help_response (GtkWidget *dialog,
* Appart from the @component, @page and @offset the following information
* is also send to the server: user language and the xfce_version_string().
*
+ * See also: xfce_dialog_show_help_with_version().
+ *
* Since 4.10
*/
void
@@ -150,6 +152,39 @@ xfce_dialog_show_help (GtkWindow *parent,
const gchar *page,
const gchar *offset)
{
+
+}
+
+
+
+/**
+ * xfce_dialog_show_help_with_version:
+ * @parent: transient parent of the dialog, or %NULL.
+ * @component : name of the component opening the help page or %NULL. If the
+ * value is %NULL the target will be the main page of the
+ * documentation website.
+ * @page : subpage of the @component on the website or %NULL.
+ * @offset: anchor offset in @page or %NULL.
+ * @version : alternative version, or %NULL to use xfce_version_string().
+ *
+ * Asks the user to visit the online documentation. If confirmed, it will open
+ * the webbrowser and redirect the user to the correct location.
+ *
+ * Appart from the @component, @page and @offset the following information
+ * is also send to the server: user language and the xfce_version_string()
+ * or @version if set.
+ *
+ * See also: xfce_dialog_show_help().
+ *
+ * Since 4.12
+ */
+void
+xfce_dialog_show_help_with_version (GtkWindow *parent,
+const gchar *component,
+const gchar *page,
+const gchar *offset,
+const gchar *version)
+{
GtkWidget *dialog;
const gchar *name;
gchar *primary;
@@ -170,9 +205,13 @@ xfce_dialog_show_help (GtkWindow *parent,
else
locale = g_strdup (C);
+ /* use desktop version if none is set */
+ if (version == NULL)
+version = xfce_version_string ();
+
/* build the redirect uri */
uri = g_string_new (MANUAL_WEBSITE);
- g_string_append_printf (uri, ?version=%slocale=%s, xfce_version_string
(), locale);
+ g_string_append_printf (uri, ?version=%slocale=%s, version, locale);
g_free (locale);
if (component != NULL)
diff --git a/libxfce4ui/xfce-dialogs.h b/libxfce4ui/xfce-dialogs.h
index f004c3f..f5bd357 100644
--- a/libxfce4ui/xfce-dialogs.h
+++ b/libxfce4ui/xfce-dialogs.h
@@ -31,56 +31,62 @@ G_BEGIN_DECLS
#define XFCE_BUTTON_TYPE_MIXED button-mixed
#define XFCE_BUTTON_TYPE_PIXBUF button-pixbuf
-void xfce_dialog_show_help (GtkWindow*parent,
- const gchar *application,
- const gchar *page,
- const gchar *offset);
-
-void xfce_dialog_show_info (GtkWindow*parent
[Xfce4-commits] forum:master Upgrade to fluxbb 1.5.6.
Updating branch refs/heads/master
to 1c9897a1fc53e08139dd3d6d91b5d8d8825b4b8b (commit)
from 8a970c1e1f119b496cadf877bf24aaa61d3a07e3 (commit)
commit 1c9897a1fc53e08139dd3d6d91b5d8d8825b4b8b
Author: Nick Schermer n...@xfce.org
Date: Sun Feb 9 20:08:18 2014 +0100
Upgrade to fluxbb 1.5.6.
admin_bans.php | 10 +-
admin_categories.php|6 +++---
admin_censoring.php |4 ++--
admin_forums.php|8
admin_groups.php|8
admin_maintenance.php |4 ++--
admin_options.php | 22 +++---
admin_permissions.php |6 +++---
admin_reports.php |4 ++--
admin_users.php | 14 +++---
db_update.php |2 +-
delete.php |4 ++--
edit.php|4 ++--
footer.php |2 +-
include/cache.php |2 +-
include/common.php |2 +-
include/functions.php | 29 +
index.php |2 +-
install.php |2 +-
lang/English/common.php |1 +
misc.php|3 +++
moderate.php|4 +++-
post.php|5 +
profile.php | 14 ++
search.php |2 +-
style/Air.css |4
style/Earth.css |4
style/Fire.css |4
userlist.php|2 +-
viewforum.php |7 ++-
30 files changed, 112 insertions(+), 73 deletions(-)
diff --git a/admin_bans.php b/admin_bans.php
index fa3c0ed..5d6d5b5 100644
--- a/admin_bans.php
+++ b/admin_bans.php
@@ -116,7 +116,7 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
?php endif; ?fieldset
legend?php echo
$lang_admin_bans['Ban advanced subhead'] ?/legend
div class=infldset
- table class=aligntop
cellspacing=0
+ table class=aligntop
tr
th
scope=row?php echo $lang_admin_bans['Username label'] ?/th
td
@@ -147,7 +147,7 @@ if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
fieldset
legend?php echo
$lang_admin_bans['Message expiry subhead'] ?/legend
div class=infldset
- table class=aligntop
cellspacing=0
+ table class=aligntop
tr
th
scope=row?php echo $lang_admin_bans['Ban message label'] ?/th
td
@@ -407,7 +407,7 @@ else if (isset($_GET['find_ban']))
h2span?php echo $lang_admin_bans['Results head'] ?/span/h2
div class=box
div class=inbox
- table cellspacing=0
+ table
thead
tr
th class=tcl scope=col?php echo
$lang_admin_bans['Results username head'] ?/th
@@ -489,7 +489,7 @@ generate_admin_menu('bans');
fieldset
legend?php echo
$lang_admin_bans['Add ban subhead'] ?/legend
div class=infldset
- table class=aligntop
cellspacing=0
+ table class=aligntop
tr
th
scope=row?php echo $lang_admin_bans['Username label'] ?divinput
type=submit name=add_ban value=?php echo $lang_admin_common['Add'] ?
tabindex=2 //div/th
td
@@ -513,7 +513,7 @@ generate_admin_menu('bans');
legend?php echo
$lang_admin_bans['Ban search subhead'] ?/legend
div class=infldset
p?php echo
$lang_admin_bans['Ban search info'] ?/p
- table class=aligntop
cellspacing=0
+ table class=aligntop
[Xfce4-commits] forum:master Update bb to 2.2.15.
Updating branch refs/heads/master
to f4d83cd2fda80e52102342694f51c57c144267ea (commit)
from 1c9897a1fc53e08139dd3d6d91b5d8d8825b4b8b (commit)
commit f4d83cd2fda80e52102342694f51c57c144267ea
Author: Nick Schermer n...@xfce.org
Date: Sun Feb 9 20:09:21 2014 +0100
Update bb to 2.2.15.
include/bad-behavior/blacklist.inc.php |1 +
include/bad-behavior/core.inc.php |2 +-
include/bad-behavior/post.inc.php |2 +-
include/bad-behavior/screener.inc.php |7 +--
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/bad-behavior/blacklist.inc.php
b/include/bad-behavior/blacklist.inc.php
index 2a139c3..f0b358b 100644
--- a/include/bad-behavior/blacklist.inc.php
+++ b/include/bad-behavior/blacklist.inc.php
@@ -93,6 +93,7 @@ function bb2_blacklist($package) {
Murzillo compatible, // comment spam bot
.NET CLR 1), // free poker, etc.
.NET CLR1,// spam harvester
+ Netsparker, // vulnerability scanner
Nikto/, // vulnerability scanner
Perman Surfer,// old and very broken harvester
POE-Component-Client, // free poker, etc.
diff --git a/include/bad-behavior/core.inc.php
b/include/bad-behavior/core.inc.php
index 805e11b..c826acf 100644
--- a/include/bad-behavior/core.inc.php
+++ b/include/bad-behavior/core.inc.php
@@ -1,5 +1,5 @@
?php if (!defined('BB2_CWD')) die(I said no cheating!);
-define('BB2_VERSION', 2.2.14);
+define('BB2_VERSION', 2.2.15);
// Bad Behavior entry point is bb2_start()
// If you're reading this, you are probably lost.
diff --git a/include/bad-behavior/post.inc.php
b/include/bad-behavior/post.inc.php
index 88c99ba..00739d0 100644
--- a/include/bad-behavior/post.inc.php
+++ b/include/bad-behavior/post.inc.php
@@ -64,7 +64,7 @@ function bb2_post($settings, $package)
}
// Screen by cookie/JavaScript form add
- if (isset($_COOKIE[BB2_COOKIE])) {
+ if (isset($_COOKIE[BB2_COOKIE]) !$settings['eu_cookie']) {
$screener1 = explode( , $_COOKIE[BB2_COOKIE]);
} else {
$screener1 = array(0);
diff --git a/include/bad-behavior/screener.inc.php
b/include/bad-behavior/screener.inc.php
index b50f02f..b34c03d 100644
--- a/include/bad-behavior/screener.inc.php
+++ b/include/bad-behavior/screener.inc.php
@@ -4,8 +4,11 @@
function bb2_screener_cookie($settings, $package, $cookie_name, $cookie_value)
{
- // FIXME: Set the real cookie
- if (!$settings['eu_cookie']) {
+ if ($settings['eu_cookie']) {
+ // Delete existing cookie, if any
+ setcookie($cookie_name, $cookie_value, 1, bb2_relative_path());
+ } else {
+ // Set session cookie
setcookie($cookie_name, $cookie_value, 0, bb2_relative_path());
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gigolo:master Updates for release.
Updating branch refs/heads/master
to 4a124e63a175eef5d48dc617ba18826c4e9ef41f (commit)
from fb022e695968f50e5d15e743b2e54f888c9c4508 (commit)
commit 4a124e63a175eef5d48dc617ba18826c4e9ef41f
Author: Nick Schermer n...@xfce.org
Date: Thu Jan 9 20:56:56 2014 +0100
Updates for release.
Makefile.am |1 -
NEWS| 32
configure.ac.in | 17 +++--
3 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d24d776..c225c3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = src po
EXTRA_DIST = \
autogen.sh \
- README.I18N \
gigolo.desktop.in \
intltool-extract.in \
intltool-merge.in \
diff --git a/NEWS b/NEWS
index 3ccf6e5..911fe3c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,35 @@
+Gigolo 0.4.2 (January 9, 2014)
+
+ * Fix mnemonics in the Connect dialog.
+ * Resolve symbolic links before writing config files.
+ * Remember side panel position.
+ * Store and display colours for bookmarks.
+ * Allow editing bookmarks from the main window popup menu.
+ * Do not set the colour when no colour is explicitly selected.
+ * Add a separator to the Bookmark Edit Dialog.
+ * Don't show errors we are not supposed to show.
+ * Automatically choose the first Samba share if any were found.
+ * Add 'Open in Terminal' command.
+ * Remove some set but unused variables.
+ * Display bookmark name in the connection list if the connection
+ has a bookmark.
+ * Do not make the Connect button insensitive, never (bug #8103).
+ * Improve WebDav URI handling.
+ * Validate an entered custom URI by trying to parse it.
+ * After creating/editing a bookmark, update the list of mounts.
+ * Fix WebDav path parsing when there is no path.
+ * Add new command-line option to auto connect bookmarks.
+ * Drop Waf build system support and just use autotools.
+ * Translation updates: Arabic, Asturian, Bulgarian, Catalan
+ (Valencian), Czech, Danish, German, Greek, English (Australia),
+ Esperanto, Spanish (Castilian), Basque, Finnish, French, Galician,
+ Hebrew, Croatian, Hungarian, Indonesian, Icelandic, Italian,
+ Japanese, Kazakh, Korean, Lithuanian, Latvian, Dutch (Flemish),
+ Occitan (post 1500), Polish, Portuguese, Portuguese (Brazilian),
+ Russian, Slovak, Slovenian, Serbian, Swedish, Telugu, Turkish,
+ Uyghur, Ukrainian, Urdu, Urdu (Pakistan), Chinese (China), Chinese
+ (Taiwan).
+
Gigolo 0.4.1 (July 31, 2010)
* Use SSH/SFTP as default connection type for new bookmarks/connections
diff --git a/configure.ac.in b/configure.ac.in
index eecbbc0..16fd5f7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gigolo], [0.4.1], [http://bugs.xfce.org/])
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AC_INIT([gigolo], [0.4.2], [http://bugs.xfce.org/])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -32,18 +32,7 @@ AC_ARG_ENABLE(deprecated, [ --disable-deprecatedDisable
deprecated GTK func
GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
# i18n
-GETTEXT_PACKAGE=gigolo
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, $GETTEXT_PACKAGE, [Gettext package.])
-
-if test ${LINGUAS}; then
- ALL_LINGUAS=${LINGUAS}
-else
- if test -z $conf_dir ; then
- conf_dir=.
- fi
- ALL_LINGUAS=`cd $conf_dir/po 2/dev/null ls *.po 2/dev/null |
$AWK 'BEGIN { FS=.; ORS= } { print $1 }'`
-fi
+XDT_I18N([@LINGUAS@])
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gigolo|gigolo-0.4.2 Creating annotated tag gigolo-0.4.2
Updating annotated tag refs/tags/gigolo-0.4.2 as new annotated tag to 3ad445d9b8eda0fc87dd21d95b9c131d1693e9ce (tag) succeeds gigolo-0.4.1-314-gfb022e6 tagged by Nick Schermer n...@xfce.org on 2014-01-09 20:58 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskmanager:master Fix compiler warnings.
Updating branch refs/heads/master to b367fdd1a95ce508c5f193a046030bf53e02662c (commit) from f0232ca7c796345f90bfc375f48e72eaedc21d02 (commit) commit b367fdd1a95ce508c5f193a046030bf53e02662c Author: Nick Schermer n...@xfce.org Date: Wed Jan 8 19:35:17 2014 +0100 Fix compiler warnings. src/app-manager.h |2 +- src/exec-tool-button.c |4 ++-- src/exec-tool-button.h |2 +- src/process-statusbar.h|2 +- src/process-tree-view.h|2 +- src/settings-tool-button.c |4 ++-- src/settings-tool-button.h |2 +- src/settings.h |2 +- src/task-manager.c |2 +- src/task-manager.h |2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app-manager.h b/src/app-manager.h index ebded9a..89924c3 100644 --- a/src/app-manager.h +++ b/src/app-manager.h @@ -38,7 +38,7 @@ struct _App typedef struct _XtmAppManager XtmAppManager; GType xtm_app_manager_get_type(void); -XtmAppManager *xtm_app_manager_new (); +XtmAppManager *xtm_app_manager_new (void); const GArray * xtm_app_manager_get_app_list (XtmAppManager *manager); App * xtm_app_manager_get_app_from_pid (XtmAppManager *manager, gint pid); diff --git a/src/exec-tool-button.c b/src/exec-tool-button.c index f814ff5..fbb4d16 100644 --- a/src/exec-tool-button.c +++ b/src/exec-tool-button.c @@ -35,8 +35,8 @@ struct _XtmExecToolButton }; G_DEFINE_TYPE (XtmExecToolButton, xtm_exec_tool_button, GTK_TYPE_MENU_TOOL_BUTTON) -static GtkWidget * construct_menu (); -static voidexecute_default_command (); +static GtkWidget * construct_menu (void); +static voidexecute_default_command (void); diff --git a/src/exec-tool-button.h b/src/exec-tool-button.h index a08aecc..8a2c497 100644 --- a/src/exec-tool-button.h +++ b/src/exec-tool-button.h @@ -27,6 +27,6 @@ typedef struct _XtmExecToolButton XtmExecToolButton; GType xtm_exec_tool_button_get_type (void); -GtkWidget *xtm_exec_tool_button_new(); +GtkWidget *xtm_exec_tool_button_new(void); #endif /* !EXEC_TOOL_BUTTON_H */ diff --git a/src/process-statusbar.h b/src/process-statusbar.h index ab68387..e0820d5 100644 --- a/src/process-statusbar.h +++ b/src/process-statusbar.h @@ -27,6 +27,6 @@ typedef struct _XtmProcessStatusbar XtmProcessStatusbar; GType xtm_process_statusbar_get_type (void); -GtkWidget *xtm_process_statusbar_new (); +GtkWidget *xtm_process_statusbar_new (void); #endif /* !PROCESS_STATUSBAR_H */ diff --git a/src/process-tree-view.h b/src/process-tree-view.h index 3082806..8d2725e 100644 --- a/src/process-tree-view.h +++ b/src/process-tree-view.h @@ -50,7 +50,7 @@ enum typedef struct _XtmProcessTreeView XtmProcessTreeView; GType xtm_process_tree_view_get_type (void); -GtkWidget *xtm_process_tree_view_new (); +GtkWidget *xtm_process_tree_view_new (void); void xtm_process_tree_view_get_sort_column_id (XtmProcessTreeView *treeview, gint *sort_column_id, GtkSortType *sort_type); #endif /* !PROCESS_TREE_VIEW_H */ diff --git a/src/settings-tool-button.c b/src/settings-tool-button.c index b7f29e5..a44b7d4 100644 --- a/src/settings-tool-button.c +++ b/src/settings-tool-button.c @@ -33,8 +33,8 @@ struct _XtmSettingsToolButton }; G_DEFINE_TYPE (XtmSettingsToolButton, xtm_settings_tool_button, GTK_TYPE_MENU_TOOL_BUTTON) -static GtkWidget * construct_menu (); -static voidshow_settings_dialog(); +static GtkWidget * construct_menu (void); +static voidshow_settings_dialog (XtmSettingsToolButton *button); diff --git a/src/settings-tool-button.h b/src/settings-tool-button.h index 0b18bed..8af6415 100644 --- a/src/settings-tool-button.h +++ b/src/settings-tool-button.h @@ -27,6 +27,6 @@ typedef struct _XtmSettingsToolButton XtmSettingsToolButton; GType xtm_settings_tool_button_get_type (void); -GtkWidget *xtm_settings_tool_button_new(); +GtkWidget *xtm_settings_tool_button_new(void); #endif /* !SETTINGS_TOOL_BUTTON_H */ diff --git a/src/settings.h b/src/settings.h index 64f0c9d..7a2bc3f 100644 --- a/src/settings.h +++ b/src/settings.h @@ -26,7 +26,7 @@ typedef struct _XtmSettings XtmSettings; GType xtm_settings_get_type
[Xfce4-commits] xfce4-taskmanager|xfce4-taskmanager-1.0.1 Creating annotated tag xfce4-taskmanager-1.0.1
Updating annotated tag refs/tags/xfce4-taskmanager-1.0.1 as new annotated tag to c6dba08c4d386fa85db30b9a4291b1509480a3ad (tag) succeeds 1.0.0-198-gd62b9a1 tagged by Nick Schermer n...@xfce.org on 2014-01-08 19:42 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskmanager:master Updates for release.
Updating branch refs/heads/master to b8e87893377930882f108259faaec088e9962de9 (commit) from d62b9a156b338a52fa5bf311311e8b8b8aa99b6f (commit) commit b8e87893377930882f108259faaec088e9962de9 Author: Nick Schermer n...@xfce.org Date: Wed Jan 8 19:41:32 2014 +0100 Updates for release. NEWS| 18 ++ configure.ac.in |2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5c93182..295ab54 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,21 @@ +1.0.1 + +- Add Run Task Manager as root item in Execute menu +- Add a menu position function +- Fix shell substitution for Korn Shell (ksh) +- Set monitor's background box use the prelight state +- Remove quit tool button +- OpemBSD removed KERN_PROC2/KINFO_PROC2 some months ago. +- Translation updates: Arabic, Belarusian, Bulgarian, Catalan + (Valencian), Czech, Danish, German, Greek, English (Australia), + English (United Kingdom), Spanish (Castilian), Basque, Finnish, + French, Galician, Hebrew, Croatian, Hungarian, Indonesian, Icelandic, + Italian, Japanese, Kazakh, Korean, Lithuanian, Dutch (Flemish), + Occitan (post 1500), Polish, Portuguese, Portuguese (Brazilian), + Russian, Slovak, Slovenian, Serbian, Swedish, Telugu, Turkish, + Uyghur, Ukrainian, Chinese (China), Chinese (Hong Kong), Chinese + (Taiwan). + 1.0.0 - Replaced progress bars against monitors diff --git a/configure.ac.in b/configure.ac.in index 0a435eb..a114bd3 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ m4_define([taskmanager_version_major], [1]) m4_define([taskmanager_version_minor], [0]) m4_define([taskmanager_version_micro], [1]) m4_define([taskmanager_version_build], [@REVISION@]) -m4_define([taskmanager_version_tag], [git]) +m4_define([taskmanager_version_tag], []) m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskmanager:master Drop old docs module.
Updating branch refs/heads/master to d62b9a156b338a52fa5bf311311e8b8b8aa99b6f (commit) from b367fdd1a95ce508c5f193a046030bf53e02662c (commit) commit d62b9a156b338a52fa5bf311311e8b8b8aa99b6f Author: Nick Schermer n...@xfce.org Date: Wed Jan 8 19:37:16 2014 +0100 Drop old docs module. .gitmodules |3 --- Makefile.am |1 - autogen.sh |1 - doc |1 - 4 files changed, 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index c036f58..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule doc] - path = doc - url = git://git.xfce.org/xfce/xfce4-docs diff --git a/Makefile.am b/Makefile.am index 6ffa8d9..6aef17a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = \ po \ - doc \ src desktopdir = $(datadir)/applications diff --git a/autogen.sh b/autogen.sh index afb596b..55007f7 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/doc b/doc deleted file mode 16 index 204be31..000 --- a/doc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 204be31d03158fa84cb5dc4b3a7f0781fe56091e ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskmanager:master Port release tag bump.
Updating branch refs/heads/master to d720c86b87e183e05b5f5158c03d77d97e889c40 (commit) from b8e87893377930882f108259faaec088e9962de9 (commit) commit d720c86b87e183e05b5f5158c03d77d97e889c40 Author: Nick Schermer n...@xfce.org Date: Wed Jan 8 19:46:06 2014 +0100 Port release tag bump. configure.ac.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index a114bd3..eec9ef4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,9 +9,9 @@ dnl *** Version information *** dnl *** m4_define([taskmanager_version_major], [1]) m4_define([taskmanager_version_minor], [0]) -m4_define([taskmanager_version_micro], [1]) +m4_define([taskmanager_version_micro], [2]) m4_define([taskmanager_version_build], [@REVISION@]) -m4_define([taskmanager_version_tag], []) +m4_define([taskmanager_version_tag], [git]) m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Add tweak setting to toggle roll up feature (bug #10563).
Updating branch refs/heads/master to a99c18c19ce6f17150818d6c0af23556fac1d454 (commit) from 3dab5fb5d641606fd12fb710881af8a3d8858681 (commit) commit a99c18c19ce6f17150818d6c0af23556fac1d454 Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 18:13:27 2013 +0100 Add tweak setting to toggle roll up feature (bug #10563). settings-dialogs/tweaks-settings.c |5 + settings-dialogs/xfwm4-tweaks-dialog.glade | 16 2 files changed, 21 insertions(+) diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c index 0b6a7eb..568bf2d 100644 --- a/settings-dialogs/tweaks-settings.c +++ b/settings-dialogs/tweaks-settings.c @@ -185,6 +185,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder) GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, snap_resist_check)); GtkWidget *urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, urgent_blink)); GtkWidget *repeat_urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, repeat_urgent_blink)); +GtkWidget *mousewheel_rollup = GTK_WIDGET (gtk_builder_get_object (builder, mousewheel_rollup)); /* Workspaces tab */ GtkWidget *scroll_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, scroll_workspaces_check)); @@ -356,6 +357,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder) /general/repeat_urgent_blink, G_TYPE_BOOLEAN, (GObject *)repeat_urgent_blink, active); +xfconf_g_property_bind (xfwm4_channel, +/general/mousewheel_rollup, +G_TYPE_BOOLEAN, +(GObject *)mousewheel_rollup, active); gtk_widget_set_sensitive (repeat_urgent_blink, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (urgent_blink))); gtk_widget_set_sensitive (tile_on_move_check, diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade index 77cf607..0fc58de 100644 --- a/settings-dialogs/xfwm4-tweaks-dialog.glade +++ b/settings-dialogs/xfwm4-tweaks-dialog.glade @@ -494,6 +494,22 @@ or skip taskbar properties set/property property name=position7/property /packing /child +child + object class=GtkCheckButton id=mousewheel_rollup +property name=label translatable=yesUse mouse wheel on title bar to ro_ll up the window/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position8/property + /packing +/child /object packing property name=position2/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix ordering of items in dialog.
Updating branch refs/heads/master to 3dab5fb5d641606fd12fb710881af8a3d8858681 (commit) from 7b091d1fbcc4489d1235865eef0d4ba5ba18b1e2 (commit) commit 3dab5fb5d641606fd12fb710881af8a3d8858681 Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 18:02:37 2013 +0100 Fix ordering of items in dialog. settings-dialogs/xfwm4-tweaks-dialog.glade | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade index d026dfd..77cf607 100644 --- a/settings-dialogs/xfwm4-tweaks-dialog.glade +++ b/settings-dialogs/xfwm4-tweaks-dialog.glade @@ -447,8 +447,8 @@ or skip taskbar properties set/property /packing /child child - object class=GtkCheckButton id=urgent_blink -property name=label translatable=yesNotify of _urgency by making window's decoration blink/property + object class=GtkCheckButton id=snap_resist_check +property name=label translatable=yesUse _edge resistance instead of window snapping/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -463,8 +463,8 @@ or skip taskbar properties set/property /packing /child child - object class=GtkCheckButton id=snap_resist_check -property name=label translatable=yesUse _edge resistance instead of window snapping/property + object class=GtkCheckButton id=urgent_blink +property name=label translatable=yesNotify of _urgency by making window's decoration blink/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property @@ -475,7 +475,7 @@ or skip taskbar properties set/property packing property name=expandFalse/property property name=fillFalse/property -property name=position5/property +property name=position6/property /packing /child child @@ -491,7 +491,7 @@ or skip taskbar properties set/property packing property name=expandFalse/property property name=fillFalse/property -property name=position6/property +property name=position7/property /packing /child /object ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Disable roll up feature by default (bug #10563).
Updating branch refs/heads/master
to d8c3df328934e865c92e8b2deb74f74b19a724b4 (commit)
from a99c18c19ce6f17150818d6c0af23556fac1d454 (commit)
commit d8c3df328934e865c92e8b2deb74f74b19a724b4
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 26 18:16:40 2013 +0100
Disable roll up feature by default (bug #10563).
Probably a confusing feature for new users, the previous commit
made it easy to enable this again.
src/settings.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings.c b/src/settings.c
index a8a9e06..19fb46e 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -697,7 +697,7 @@ loadSettings (ScreenInfo *screen_info)
{placement_ratio, NULL, G_TYPE_INT, TRUE},
{placement_mode, NULL, G_TYPE_STRING, TRUE},
{popup_opacity, NULL, G_TYPE_INT, TRUE},
-{mousewheel_rollup, NULL, G_TYPE_BOOLEAN, TRUE},
+{mousewheel_rollup, NULL, G_TYPE_BOOLEAN, FALSE},
{prevent_focus_stealing, NULL, G_TYPE_BOOLEAN, TRUE},
{raise_delay, NULL, G_TYPE_INT, TRUE},
{raise_on_click, NULL, G_TYPE_BOOLEAN, TRUE},
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Increase double click time to 400ms (bug #10562).
Updating branch refs/heads/master to 8f95e0836365e62d052cc000f3b7a0145cd2c81c (commit) from 44540d572dd3fc71bde23086834912551f181037 (commit) commit 8f95e0836365e62d052cc000f3b7a0145cd2c81c Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 18:20:49 2013 +0100 Increase double click time to 400ms (bug #10562). Gtk's default is somewhat fast for most people, 400ms is a default used by most other desktops. xfsettingsd/xsettings.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml index 0a579d6..ef56c59 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml @@ -8,7 +8,7 @@ property name=Net type=empty property name=ThemeName type=empty/ property name=IconThemeName type=empty/ -property name=DoubleClickTime type=int value=250/ +property name=DoubleClickTime type=int value=400/ property name=DoubleClickDistance type=int value=5/ property name=DndDragThreshold type=int value=8/ property name=CursorBlink type=bool value=true/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Set EWMH client type to WNCK_CLIENT_TYPE_PAGER (bug #10508).
Updating branch refs/heads/master to d296ca76507bc5ffdbb8e77745568cf5063e069d (commit) from cdc3737f971d48d57dae15875f416ba772d0a8bf (commit) commit d296ca76507bc5ffdbb8e77745568cf5063e069d Author: Arnout Engelen x...@bzzt.net Date: Thu Dec 26 18:31:05 2013 +0100 Set EWMH client type to WNCK_CLIENT_TYPE_PAGER (bug #10508). This is for window managers to tell them a pager or tasklist requested the action. panel/Makefile.am |3 +++ panel/main.c |4 2 files changed, 7 insertions(+) diff --git a/panel/Makefile.am b/panel/Makefile.am index a19453d..f3f14a0 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -2,6 +2,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\xfce4-panel\ \ + -DWNCK_I_KNOW_THIS_IS_UNSTABLE \ -DDATADIR=\$(datadir)/xfce4\ \ -DLIBDIR=\$(libdir)/xfce4\ \ -DHELPERDIR=\$(HELPER_PATH_PREFIX)/xfce4/panel\ \ @@ -60,6 +61,7 @@ xfce4_panel_CFLAGS = \ $(EXO_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ + $(LIBWNCK_CFLAGS) \ $(DBUS_CFLAGS) \ $(XFCONF_CFLAGS) \ $(LIBX11_CFLAGS) \ @@ -77,6 +79,7 @@ xfce4_panel_LDADD = \ $(GMODULE_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ + $(LIBWNCK_LIBS) \ $(XFCONF_LIBS) \ $(DBUS_LIBS) \ $(LIBX11_LIBS) \ diff --git a/panel/main.c b/panel/main.c index 4ed389a..2ef0091 100644 --- a/panel/main.c +++ b/panel/main.c @@ -40,6 +40,7 @@ #include dbus/dbus-glib.h #include libxfce4util/libxfce4util.h #include libxfce4ui/libxfce4ui.h +#include libwnck/libwnck.h #include common/panel-private.h #include common/panel-debug.h @@ -338,6 +339,9 @@ main (gint argc, gchar **argv) for (i = 0; i G_N_ELEMENTS (signums); i++) signal (signums[i], panel_signal_handler); + /* set EWMH source indication */ + wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER); + application = panel_application_get (); panel_application_load (application, opt_disable_wm_check); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Updates for release.
Updating branch refs/heads/master to a33597ba929fb4cccb3626b0329c4db297816385 (commit) from 44682489526d2209d296344b8033a521cdd05158 (commit) commit a33597ba929fb4cccb3626b0329c4db297816385 Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 22:29:42 2013 +0100 Updates for release. NEWS| 37 ++--- configure.ac.in |4 ++-- po/POTFILES.in |1 + 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 5969aab..13a3264 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +0.6.3 += +- Improve URL matching (bug #7959, bug #9800). +- Fix encoding menu creation (bug #10395). +- Added light solarized colorscheme (bug #10286). +- Fixed wrong foreground color in solarized dark (bug #10285). +- Fix terminal session restore (bug #9732). +- Translation updates: Arabic, Bulgarian, Czech, Danish, German, + Greek, English (Australia), English (United Kingdom), Spanish + (Castilian), Basque, Finnish, French, Hebrew, Croatian, Hungarian, + Indonesian, Dutch (Flemish), Occitan (post 1500), Portuguese, + Russian, Thai, Turkish, Uyghur, Ukrainian, Chinese (China), Chinese + (Hong Kong), Chinese (Taiwan). + + 0.6.2 = - Autotools updates. @@ -6,15 +21,15 @@ - Display checking on drop-down windows (bug #9957). - Fix format warning. - Only call g_type_init on glib 2.36. -- Translation updates: Arabic, Asturian, Belarusian, Bulgarian, - Catalan (Valencian), Czech, Danish, German, Greek, English (United - Kingdom), Esperanto, Spanish (Castilian), Estonian, Basque, Finnish, - French, Galician, Hebrew, Croatian, Hungarian, Indonesian, Icelandic, - Italian, Japanese, Kazakh, Korean, Lithuanian, Latvian, Norwegian - Bokmal, Dutch (Flemish), Panjabi (Punjabi), Polish, Portuguese, - Portuguese (Brazilian), Romanian, Russian, Sinhala, Slovak, Albanian, - Serbian, Swedish, Telugu, Turkish, Uyghur, Ukrainian, Urdu, Urdu - (Pakistan), Vietnamese, Chinese (China), Chinese (Hong Kong), Chinese +- Translation updates: Arabic, Asturian, Belarusian, Bulgarian, + Catalan (Valencian), Czech, Danish, German, Greek, English (United + Kingdom), Esperanto, Spanish (Castilian), Estonian, Basque, Finnish, + French, Galician, Hebrew, Croatian, Hungarian, Indonesian, Icelandic, + Italian, Japanese, Kazakh, Korean, Lithuanian, Latvian, Norwegian + Bokmal, Dutch (Flemish), Panjabi (Punjabi), Polish, Portuguese, + Portuguese (Brazilian), Romanian, Russian, Sinhala, Slovak, Albanian, + Serbian, Swedish, Telugu, Turkish, Uyghur, Ukrainian, Urdu, Urdu + (Pakistan), Vietnamese, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan). @@ -39,8 +54,8 @@ - Allow underscore and + in email address (bug #9392). - Use new GPL license address (bug #9697). - Allow setting the geometry in the preferences. -- Translation updates: Spanish (Castilian), French, Croatian, - Italian, Japanese, Kazakh, Dutch (Flemish), Polish, Portuguese, +- Translation updates: Spanish (Castilian), French, Croatian, + Italian, Japanese, Kazakh, Dutch (Flemish), Polish, Portuguese, Portuguese (Brazilian), Romanian. diff --git a/configure.ac.in b/configure.ac.in index 7bb10c6..42a543e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,10 +10,10 @@ dnl *** Version information *** dnl *** m4_define([terminal_version_major], [0]) m4_define([terminal_version_minor], [6]) -m4_define([terminal_version_micro], [2]) +m4_define([terminal_version_micro], [3]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], [git]) +m4_define([terminal_version_tag], []) m4_define([terminal_version_dbus], [5]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 23bad32..dede288 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,7 @@ colorschemes/black-on-white.theme.in colorschemes/dark-pastels.theme.in colorschemes/green-on-black.theme.in colorschemes/solarized-dark.theme.in +colorschemes/solarized-light.theme.in colorschemes/tango.theme.in colorschemes/white-on-black.theme.in colorschemes/xterm.theme.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Post release tag bump
Updating branch refs/heads/master to 46786920665c41775f1847391076ebb4c1e3 (commit) from a33597ba929fb4cccb3626b0329c4db297816385 (commit) commit 46786920665c41775f1847391076ebb4c1e3 Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 22:32:52 2013 +0100 Post release tag bump configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 42a543e..6193df8 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ m4_define([terminal_version_minor], [6]) m4_define([terminal_version_micro], [3]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], []) +m4_define([terminal_version_tag], [git]) m4_define([terminal_version_dbus], [5]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal|xfce4-terminal-0.6.3 Creating annotated tag xfce4-terminal-0.6.3
Updating annotated tag refs/tags/xfce4-terminal-0.6.3 as new annotated tag to 3c820959f4696cc0adbb75adf8eadf3589868b89 (tag) succeeds xfce4-terminal-0.6.2-56-g4468248 tagged by Nick Schermer n...@xfce.org on 2013-12-26 22:32 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Updates for release.
Updating branch refs/heads/master to 2b800f4f994e0e3951fc221933705051329b75bd (commit) from d8c3df328934e865c92e8b2deb74f74b19a724b4 (commit) commit 2b800f4f994e0e3951fc221933705051329b75bd Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 22:41:16 2013 +0100 Updates for release. NEWS| 32 +--- configure.ac.in |4 ++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 11082ce..950d084 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,21 @@ +4.11.1 +== +- Remove unnecessary clipping of the rootPicture. +- If making a solid fill, use XRenderCreateSolidFill. +- Repaint the screen when background changes. +- Ignore when root atoms are unset. +- Implement zooming. +- Add tweak setting to toggle roll up feature (bug #10563). +- Disable roll up feature by default (bug #10563). +- Translation updates: Asturian, Bulgarian, Bengali, Catalan + (Valencian), Danish, German, Greek, Spanish (Castilian), Basque, + Finnish, Galician, Hungarian, Indonesian, Icelandic, Japanese, + Kazakh, Lithuanian, Latvian, Malay, Norwegian Bokmal, Norwegian + Nynorsk, Occitan (post 1500), Portuguese (Brazilian), Romanian, + Slovak, Albanian, Serbian, Swedish, Ukrainian, Urdu, Urdu (Pakistan), + Chinese (Hong Kong), Chinese (Taiwan). + + 4.11.0 == - Fix duplicated accelerators (bug #5256). @@ -9,13 +27,13 @@ - Fixup padding in keyboard shortcuts tab. - Autotools updates. - Add Vsync support for the compositor (bug #8898). -- Translation updates: Arabic, Azerbaijani, Belarusian, Bulgarian, - Bengali (India), Catalan (Valencian), Czech, Danish, German, - Dzongkha, Greek, English (United Kingdom), Spanish (Castilian), - Basque, Persian, French, Gujarati, Hebrew, Hindi, Croatian, - Hungarian, Indonesian, Icelandic, Italian, Georgian, Kazakh, Korean, - Macedonian, Marathi, Malay, Dutch (Flemish), Polish, Portuguese, - Portuguese (Brazilian), Russian, Slovak, Serbian, Tamil, Thai, +- Translation updates: Arabic, Azerbaijani, Belarusian, Bulgarian, + Bengali (India), Catalan (Valencian), Czech, Danish, German, + Dzongkha, Greek, English (United Kingdom), Spanish (Castilian), + Basque, Persian, French, Gujarati, Hebrew, Hindi, Croatian, + Hungarian, Indonesian, Icelandic, Italian, Georgian, Kazakh, Korean, + Macedonian, Marathi, Malay, Dutch (Flemish), Polish, Portuguese, + Portuguese (Brazilian), Russian, Slovak, Serbian, Tamil, Thai, Turkish, Uyghur, Ukrainian, Chinese (China), Chinese (Taiwan). 4.10.0 diff --git a/configure.ac.in b/configure.ac.in index 4087b75..e1bef24 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,9 +5,9 @@ dnl m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [11]) -m4_define([xfwm4_version_micro], [0]) +m4_define([xfwm4_version_micro], [1]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], [git]) +m4_define([xfwm4_version_tag], []) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4|xfwm4-4.11.1 Creating annotated tag xfwm4-4.11.1
Updating annotated tag refs/tags/xfwm4-4.11.1 as new annotated tag to 30ec8bed2afbb7360cbd622d8007373daa28c908 (tag) succeeds xfwm4-4.11.0-48-gd8c3df3 tagged by Nick Schermer n...@xfce.org on 2013-12-26 22:42 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Post release tag bump.
Updating branch refs/heads/master to 4ab23296aaaccf491458b3fa2a4c5352beefe460 (commit) from 2b800f4f994e0e3951fc221933705051329b75bd (commit) commit 4ab23296aaaccf491458b3fa2a4c5352beefe460 Author: Nick Schermer n...@xfce.org Date: Thu Dec 26 22:42:31 2013 +0100 Post release tag bump. configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index e1bef24..5a347a1 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [11]) m4_define([xfwm4_version_micro], [1]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], []) +m4_define([xfwm4_version_tag], [git]) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Fix terminal session restore.
Updating branch refs/heads/master
to b117dd5653f156272f439b086e8b833fb67c5ded (commit)
from 2b5ad8048dd3feae11c3c2342a09c338ef129385 (commit)
commit b117dd5653f156272f439b086e8b833fb67c5ded
Author: Gregory Margo gma...@yahoo.com
Date: Mon Dec 16 09:25:19 2013 -0800
Fix terminal session restore.
terminal/terminal-app.c | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 7290b0b..66dcd64 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -774,16 +774,17 @@ terminal_app_process (TerminalApp *app,
if (G_UNLIKELY (attrs == NULL))
return FALSE;
+ /* Connect to session manager first before starting any other windows */
for (lp = attrs; lp != NULL; lp = lp-next)
{
attr = lp-data;
/* take first sm client id */
- if (sm_client_id == NULL attr-sm_client_id != NULL)
-sm_client_id = g_strdup (attr-sm_client_id);
-
- terminal_app_open_window (app, attr);
- terminal_window_attr_free (attr);
+ if (attr-sm_client_id != NULL)
+{
+ sm_client_id = g_strdup (attr-sm_client_id);
+ break;
+}
}
if (G_LIKELY (app-session_client == NULL))
@@ -808,6 +809,14 @@ terminal_app_process (TerminalApp *app,
}
}
+ for (lp = attrs; lp != NULL; lp = lp-next)
+{
+ attr = lp-data;
+
+ terminal_app_open_window (app, attr);
+ terminal_window_attr_free (attr);
+}
+
g_slist_free (attrs);
g_free (sm_client_id);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Fixed wrong foreground color in solarized dark.
Updating branch refs/heads/master to 68db3a5e6cb088be63f0480d2417c6b7f36ebd80 (commit) from 0aab08157c72b4b76587cf89f8d4f1f235f2da24 (commit) commit 68db3a5e6cb088be63f0480d2417c6b7f36ebd80 Author: Lukas Anzinger lu...@lukasanzinger.at Date: Wed Aug 7 20:33:33 2013 +0200 Fixed wrong foreground color in solarized dark. [...] in the case of a dark background colorscheme, the normal relationship for background and body text is base03:base0 (please note that body text is *not* base00). [1] Since base0 is equal to #839496 in the dark version of solarized, the foreground color is wrong. [1] http://ethanschoonover.com/solarized colorschemes/solarized-dark.theme.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colorschemes/solarized-dark.theme.in b/colorschemes/solarized-dark.theme.in index ec6f6d3..eec4610 100644 --- a/colorschemes/solarized-dark.theme.in +++ b/colorschemes/solarized-dark.theme.in @@ -1,6 +1,6 @@ [Scheme] _Name=Solarized (dark) -ColorForeground=#657b83 +ColorForeground=#839496 ColorBackground=#002b36 ColorCursor=#93a1a1 TabActivityColor=#dc322f ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-terminal:master Added light solarized colorscheme.
Updating branch refs/heads/master to 0aab08157c72b4b76587cf89f8d4f1f235f2da24 (commit) from b117dd5653f156272f439b086e8b833fb67c5ded (commit) commit 0aab08157c72b4b76587cf89f8d4f1f235f2da24 Author: Lukas Anzinger lu...@lukasanzinger.at Date: Wed Aug 7 19:56:58 2013 +0200 Added light solarized colorscheme. This colorscheme is based on Ethan Schoonover's, who is the original author of solarized, xresources file. colorschemes/Makefile.am |1 + colorschemes/solarized-dark.theme.in |2 +- colorschemes/solarized-light.theme.in |9 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/colorschemes/Makefile.am b/colorschemes/Makefile.am index ef6cb96..aafb061 100644 --- a/colorschemes/Makefile.am +++ b/colorschemes/Makefile.am @@ -5,6 +5,7 @@ presets_in_files = \ dark-pastels.theme.in \ green-on-black.theme.in \ solarized-dark.theme.in \ + solarized-light.theme.in\ tango.theme.in \ white-on-black.theme.in \ xterm.theme.in diff --git a/colorschemes/solarized-dark.theme.in b/colorschemes/solarized-dark.theme.in index 0d2b86a..ec6f6d3 100644 --- a/colorschemes/solarized-dark.theme.in +++ b/colorschemes/solarized-dark.theme.in @@ -1,5 +1,5 @@ [Scheme] -_Name=Solarized +_Name=Solarized (dark) ColorForeground=#657b83 ColorBackground=#002b36 ColorCursor=#93a1a1 diff --git a/colorschemes/solarized-light.theme.in b/colorschemes/solarized-light.theme.in new file mode 100644 index 000..5894ae4 --- /dev/null +++ b/colorschemes/solarized-light.theme.in @@ -0,0 +1,9 @@ +[Scheme] +_Name=Solarized (light) +ColorForeground=#657b83 +ColorBackground=#fdf6e3 +ColorCursor=#586e75 +TabActivityColor=#dc322f +ColorPalette=#eee8d5;#dc322f;#859900;#b58900;#268bd2;#d33682;#2aa198;#073642;#fdf6e3;#cb4b16;#93a1a1;#839496;#657b83;#6c71c4;#586e75;#002b36 +ColorBold=#586e75 +ColorBoldUseDefault=FALSE ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Enable Ukrainian.
Updating branch refs/heads/master to ba662dfc4da02c29566eac05e85ca9fb3c535432 (commit) from ae449416cf645000fc316c2fa5633275e90682a5 (commit) commit ba662dfc4da02c29566eac05e85ca9fb3c535432 Author: Nick Schermer n...@xfce.org Date: Wed Dec 11 22:05:35 2013 +0100 Enable Ukrainian. lib/locales.php |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/locales.php b/lib/locales.php index 70291c5..3da67fe 100644 --- a/lib/locales.php +++ b/lib/locales.php @@ -4,17 +4,18 @@ $languages = array ( 'en' = 'English', 'de' = 'German', -'es' = 'Spanish (Castilian)', -'hu' = 'Hungarian', + 'es' = 'Spanish (Castilian)', + 'hu' = 'Hungarian', 'it' = 'Italian', 'ja' = 'Japanese', 'ko' = 'Korean', 'lt' = 'Lithuanian', 'oc' = 'Occitan', -'pl' = 'Polish', + 'pl' = 'Polish', 'pt_BR' = 'Portuguese (Brazilian)', 'sk' = 'Slovak', 'sr' = 'Serbian', + 'uk' = 'Ukrainian', 'zh_CN' = 'Chinese (China)'); /* used in header and language detection functions */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Remove unneeded files.
Updating branch refs/heads/ochosi/tabwin to 13c072c37c3bea54e6157d2f8684ef44ebbb5ea6 (commit) from 9663c98ab77ce5435af2b525ab37d6684548ccca (commit) commit 13c072c37c3bea54e6157d2f8684ef44ebbb5ea6 Author: Nick Schermer n...@xfce.org Date: Sat Jul 13 22:09:43 2013 +0200 Remove unneeded files. module.xml | 20 1 file changed, 20 deletions(-) diff --git a/module.xml b/module.xml deleted file mode 100644 index 1965099..000 --- a/module.xml +++ /dev/null @@ -1,20 +0,0 @@ -?xml version='1.0' encoding='UTF-8'? -Project xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#; - xmlns:foaf=http://xmlns.com/foaf/0.1/; - xmlns:gnome=http://api.gnome.org/doap-extensions#; - xmlns=http://usefulinc.com/ns/doap#; - - name xml:lang=enxfwm4/name - shortdesc xml:lang=enXfce's window manager/shortdesc - homepage rdf:resource=http://www.xfce.org/projects/xfwm4/ - mailing-list rdf:resource=http://foo-projects.org/mailmain/listinfo/xfce4-dev/ - - maintainer - foaf:Person -foaf:nameOlivier Fourdan/foaf:name -foaf:mboxmailto:four...@xfce.org/foaf:mbox -gnome:useridolivier/gnome:userid - /foaf:Person - /maintainer -/Project ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Drop unneeded message.
Updating branch refs/heads/ochosi/tabwin
to 6e6bcf428090adb79eaf556e5381be771567cf6a (commit)
from 25c8e5c8acb50e915610b324d9d82afe5d123a88 (commit)
commit 6e6bcf428090adb79eaf556e5381be771567cf6a
Author: Nick Schermer n...@xfce.org
Date: Sat Sep 21 11:49:17 2013 +0200
Drop unneeded message.
src/compositor.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compositor.c b/src/compositor.c
index 03607d0..b834dc1 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1357,7 +1357,7 @@ get_refresh_rate (ScreenInfo* screen_info)
if (refresh_rate != screen_info-refresh_rate)
{
-g_message (Detected refreshrate:%i hertz, refresh_rate);
+DBG (Detected refreshrate: %i hertz, refresh_rate);
screen_info-refresh_rate = refresh_rate;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Updates for release.
Updating branch refs/heads/ochosi/tabwin to ac4c478dcb4ee9cd2a62fd1ca2c0237e79e98af2 (commit) from 7fe97f3537add86b4e013b3206af1987583453a6 (commit) commit ac4c478dcb4ee9cd2a62fd1ca2c0237e79e98af2 Author: Nick Schermer n...@xfce.org Date: Mon Sep 23 19:35:19 2013 +0200 Updates for release. NEWS| 20 configure.ac.in |6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index e29179c..11082ce 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,23 @@ +4.11.0 +== +- Fix duplicated accelerators (bug #5256). +- Do not write empty session files. +- Optimize smart placement (bug #5785). +- Improvements in accelerator handling. +- Remove unmaintained translations. +- Make the xfwm4-settings dialog use less height. +- Fixup padding in keyboard shortcuts tab. +- Autotools updates. +- Add Vsync support for the compositor (bug #8898). +- Translation updates: Arabic, Azerbaijani, Belarusian, Bulgarian, + Bengali (India), Catalan (Valencian), Czech, Danish, German, + Dzongkha, Greek, English (United Kingdom), Spanish (Castilian), + Basque, Persian, French, Gujarati, Hebrew, Hindi, Croatian, + Hungarian, Indonesian, Icelandic, Italian, Georgian, Kazakh, Korean, + Macedonian, Marathi, Malay, Dutch (Flemish), Polish, Portuguese, + Portuguese (Brazilian), Russian, Slovak, Serbian, Tamil, Thai, + Turkish, Uyghur, Ukrainian, Chinese (China), Chinese (Taiwan). + 4.10.0 == - Translation updates: Czech, English (United Kingdom), Spanish diff --git a/configure.ac.in b/configure.ac.in index 9d90dac..eeadd0f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -4,15 +4,15 @@ dnl xfwm4 - window manager for the Xfce4 desktop environment dnl m4_define([xfwm4_version_major], [4]) -m4_define([xfwm4_version_minor], [10]) +m4_define([xfwm4_version_minor], [11]) m4_define([xfwm4_version_micro], [0]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], [git]) +m4_define([xfwm4_version_tag], []) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) -m4_define([libxfce4ui_minimum_version], [4.9.0]) +m4_define([libxfce4ui_minimum_version], [4.11.0]) m4_define([libxfce4kbd_private_minimum_version], [4.8.0]) m4_define([xfconf_minimum_version], [4.8.0]) m4_define([xcomposite_minimum_version], [0.2]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Post release tag bump.
Updating branch refs/heads/ochosi/tabwin to d2c3768445e207b77339af5ab5c893d77f7d0fbc (commit) from ac4c478dcb4ee9cd2a62fd1ca2c0237e79e98af2 (commit) commit d2c3768445e207b77339af5ab5c893d77f7d0fbc Author: Nick Schermer n...@xfce.org Date: Mon Sep 23 19:39:27 2013 +0200 Post release tag bump. configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index eeadd0f..4087b75 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -7,7 +7,7 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [11]) m4_define([xfwm4_version_micro], [0]) m4_define([xfwm4_version_build], [@REVISION@]) -m4_define([xfwm4_version_tag], []) +m4_define([xfwm4_version_tag], [git]) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Fix compiler warnings.
Updating branch refs/heads/ochosi/tabwin
to 51a982b74c9b48b9ae20d712127187119dad7a05 (commit)
from e7da725aab39018f54383dc6e8a64eccd8793035 (commit)
commit 51a982b74c9b48b9ae20d712127187119dad7a05
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 7 12:33:03 2013 +0100
Fix compiler warnings.
src/compositor.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index a8abd80..01ff05f 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -808,7 +808,7 @@ root_tile (ScreenInfo *screen_info)
{
DisplayInfo *display_info;
Display *dpy;
-Picture picture;
+Picture picture = None;
#ifdef MONITOR_ROOT_PIXMAP
Pixmap pixmap;
XRenderPictureAttributes pa;
@@ -2420,7 +2420,7 @@ destroy_win (DisplayInfo *display_info, Window id)
}
}
-void
+static void
recenter_zoomed_area (ScreenInfo *screen_info, int x_root, int y_root)
{
int zf = screen_info-transform.matrix[0][0];
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Xsettingsd: Unset input method properties (bug #5437).
Updating branch refs/heads/bluesabre/display-settings to adf990f6e3688b8471a969420acbeb58c57fed3a (commit) from 2d7524c2783943d7b16e8fe71154e170ad49 (commit) commit adf990f6e3688b8471a969420acbeb58c57fed3a Author: Nick Schermer n...@xfce.org Date: Wed Sep 26 18:31:14 2012 +0200 Xsettingsd: Unset input method properties (bug #5437). xfsettingsd/xsettings.xml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml index 8f9e2eb..0a579d6 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml @@ -33,13 +33,13 @@ property name=KeyThemeName type=string value=/ property name=ToolbarStyle type=string value=icons/ property name=ToolbarIconSize type=int value=3/ -property name=IMPreeditStyle type=string value=/ -property name=IMStatusStyle type=string value=/ +!-- property name=IMPreeditStyle type=string value=/ -- +!-- property name=IMStatusStyle type=string value=/ -- +!-- property name=IMModule type=string value=/ -- property name=MenuImages type=bool value=true/ property name=ButtonImages type=bool value=true/ property name=MenuBarAccel type=string value=F10/ property name=CursorThemeName type=string value=/ property name=CursorThemeSize type=int value=0/ -property name=IMModule type=string value=/ /property /channel ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed fill options for Position.
Updating branch refs/heads/bluesabre/display-settings to 55f46009289f8a7ccd336a9ea5e2ab3d06a1a81d (commit) from 544a97d69a6872dd43d545428bd33e10aedbbe6a (commit) commit 55f46009289f8a7ccd336a9ea5e2ab3d06a1a81d Author: Sean Davis smd.seanda...@gmail.com Date: Tue Sep 25 10:02:22 2012 -0400 Fixed fill options for Position. dialogs/display-settings/display-dialog.glade |1 + 1 file changed, 1 insertion(+) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index b6632a8..8bce601 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -287,6 +287,7 @@ property name=right_attach2/property property name=top_attach2/property property name=bottom_attach3/property +property name=y_optionsGTK_FILL/property /packing /child /object ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set up the position comboboxes for extended desktop mode The signals and combos are there, but some of it is just proof-of-concept
Updating branch refs/heads/bluesabre/display-settings
to 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1 (commit)
from 16dd3b15075d98ba9b539b9243684a01a366cc0c (commit)
commit 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Sep 24 23:29:22 2012 +0200
Set up the position comboboxes for extended desktop mode
The signals and combos are there, but some of it is just proof-of-concept
dialogs/display-settings/display-dialog.glade | 47 --
dialogs/display-settings/main.c | 217 -
2 files changed, 250 insertions(+), 14 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index f3d5da0..b6632a8 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -151,19 +151,6 @@
/packing
/child
child
- object class=GtkComboBox id=randr-position
-property name=visibleTrue/property
-property name=can_focusFalse/property
- /object
- packing
-property name=left_attach1/property
-property name=right_attach2/property
-property name=top_attach2/property
-property name=bottom_attach3/property
-property name=y_optionsGTK_FILL/property
- /packing
-/child
-child
object class=GtkLabel id=label-reflection
property name=can_focusFalse/property
property name=xalign0/property
@@ -268,6 +255,40 @@
property name=y_optionsGTK_FILL/property
/packing
/child
+child
+ object class=GtkHBox id=hbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkComboBox id=randr-position
+property name=visibleTrue/property
+property name=can_focusFalse/property
+ /object
+ packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkComboBox id=randr-active-displays
+property name=visibleTrue/property
+property name=can_focusFalse/property
+ /object
+ packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position1/property
+ /packing
+/child
+ /object
+ packing
+property name=left_attach1/property
+property name=right_attach2/property
+property name=top_attach2/property
+property name=bottom_attach3/property
+ /packing
+/child
/object
packing
property name=expandTrue/property
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 836daea..96daaf6 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -233,7 +233,123 @@ display_setting_timed_confirmation (GtkBuilder
*main_builder)
return ((response_id == 2) ? TRUE : FALSE);
}
+static void
+display_setting_positions_changed (GtkComboBox *combobox,
+ GtkBuilder *builder)
+{
+gint value;
+
+if (!display_setting_combo_box_get_value (combobox, value))
+return;
+}
+
+static void
+display_setting_positions_populate (GtkBuilder *builder)
+{
+GtkTreeModel *model;
+GObject *combobox;
+GtkTreeIter iter;
+
+/* Get the positions combo box store and clear it */
+combobox = gtk_builder_get_object (builder, randr-position);
+model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
+gtk_list_store_clear (GTK_LIST_STORE (model));
+
+/* Only make the combobox interactive if there is more than one output */
+if (display_settings_get_n_active_outputs () 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
+return;
+}
+else
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+
+/* Disconnect the changed signal to avoid triggering the confirmation
+ * dialog */
+g_object_disconnect (combobox, any_signal::changed,
+
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fixed above and left positioning.
Updating branch refs/heads/bluesabre/display-settings
to 7c45c31da0a14f22dc1aec02e94361674fac68e3 (commit)
from 37d456cf9f52bcddcf8d009af909ff4b69331bc2 (commit)
commit 7c45c31da0a14f22dc1aec02e94361674fac68e3
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 18:29:56 2012 -0400
Fixed above and left positioning.
dialogs/display-settings/main.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2c17dfe..f7eacd9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -265,7 +265,7 @@ display_setting_positions_changed (GtkComboBox *combobox,
current_display = xfce_randr-active_output;
switch (value) {
-case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left FIXME
+case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
/* Walk all supported modes of current display */
modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
@@ -337,6 +337,12 @@ display_setting_positions_changed (GtkComboBox *combobox,
break;
}
+/* Apply and save changes to secondary display */
+xfce_randr-active_output = selected_display;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
/* Restore the current display to the primary display. */
xfce_randr-active_output = current_display;
@@ -345,6 +351,8 @@ display_setting_positions_changed (GtkComboBox *combobox,
xfce_randr-active_output);
xfce_randr_apply (xfce_randr, Default, display_channel);
+
+
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix gloss in pixmap for extend-to-right
Updating branch refs/heads/bluesabre/display-settings to 544a97d69a6872dd43d545428bd33e10aedbbe6a (commit) from 5d5b8f596b8a29b72f2d3dac2c26b216fe0872e1 (commit) commit 544a97d69a6872dd43d545428bd33e10aedbbe6a Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Sep 24 23:32:27 2012 +0200 Fix gloss in pixmap for extend-to-right dialogs/display-settings/extend-right.png | Bin 6059 - 5958 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dialogs/display-settings/extend-right.png b/dialogs/display-settings/extend-right.png index fc520dc..3fe963e 100644 Binary files a/dialogs/display-settings/extend-right.png and b/dialogs/display-settings/extend-right.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Reduce the RandR calls for setting new display positions
Updating branch refs/heads/bluesabre/display-settings
to 12143544084112a30e989f12e949b8e515a2b93c (commit)
from bad30c37b680fd443c92c3f9d63202516a7dc238 (commit)
commit 12143544084112a30e989f12e949b8e515a2b93c
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Oct 2 17:08:55 2012 +0200
Reduce the RandR calls for setting new display positions
dialogs/display-settings/main.c | 143 ---
1 file changed, 43 insertions(+), 100 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 57c8ae8..d99df8d 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,9 +247,9 @@ static void
display_setting_positions_changed (GtkComboBox *combobox,
GtkBuilder *builder)
{
-gint value, current_display, selected_display, selected_x, selected_y,
old_x1, old_y1, old_x2, old_y2;
+gint value, current_display, current_x, current_y, selected_display,
selected_x, selected_y;
GObject *display_combobox;
-XfceRRMode *current_mode;
+XfceRRMode *current_mode, *selected_mode;
display_combobox = gtk_builder_get_object(builder,
randr-active-displays);
@@ -262,120 +262,65 @@ display_setting_positions_changed (GtkComboBox *combobox,
/* Skip if the display combobox hasn't made a selection yet */
if (selected_display == -1) return;
-/* Store the Current Display */
+/* Store the currently active display's position and mode */
current_display = xfce_randr-active_output;
+current_mode = xfce_randr_find_mode_by_id (xfce_randr, current_display,
XFCE_RANDR_MODE (xfce_randr));
+current_x = XFCE_RANDR_POS_X (xfce_randr);
+current_y = XFCE_RANDR_POS_Y (xfce_randr);
+
+/* Store the selected display's position and mode */
+xfce_randr-active_output = selected_display;
+selected_mode = xfce_randr_find_mode_by_id (xfce_randr, selected_display,
XFCE_RANDR_MODE (xfce_randr));
+selected_x = XFCE_RANDR_POS_X (xfce_randr);
+selected_y = XFCE_RANDR_POS_Y (xfce_randr);
switch (value) {
case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left
-current_mode = xfce_randr_find_mode_by_id (xfce_randr,
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
-
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-/* Move the primary to where the secondary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
+/* Move the selected display to the right of the currently active
display. */
+XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
+/* Move the currently active display to where the selected was */
xfce_randr-active_output = current_display;
-
-/* Save positions to be able to restore */
-old_x2 = selected_x; old_y2 = selected_y;
-old_x1 = XFCE_RANDR_POS_X (xfce_randr);
-old_y1 = XFCE_RANDR_POS_Y (xfce_randr);
-
XFCE_RANDR_POS_X (xfce_randr) = selected_x;
XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
-
-
-/* Move the secondary display to the right of the primary display.
*/
-xfce_randr-active_output = selected_display;
-XFCE_RANDR_POS_X (xfce_randr) = current_mode-width;
break;
case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-current_mode = xfce_randr_find_mode_by_id (xfce_randr,
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
+ /* Move the selected display to where the currently
active one is */
+XFCE_RANDR_POS_X (xfce_randr) = current_x;
+XFCE_RANDR_POS_Y (xfce_randr) = current_y;
-/* Change active output to primary display. */
+/* Move the currently active display to the right of the selected
display. */
xfce_randr-active_output = current_display;
+XFCE_RANDR_POS_X (xfce_randr) = selected_mode-width;
-/* Move the secondary to where the primary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = selected_display;
-
-/* Save positions to be able to restore */
-old_x1 = selected_x; old_y1 = selected_y;
-old_x2 = XFCE_RANDR_POS_X (xfce_randr);
-old_y2 = XFCE_RANDR_POS_Y (xfce_randr);
-
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Updated glade files.
Updating branch refs/heads/bluesabre/display-settings to 9d926f57009155586ecaf7ca62af838e38015052 (commit) from 68324bb287d1c9536df813609db53963005afdf4 (commit) commit 9d926f57009155586ecaf7ca62af838e38015052 Author: Sean Davis smd.seanda...@gmail.com Date: Thu Sep 13 16:14:25 2012 -0400 Updated glade files. dialogs/display-settings/confirmation-dialog.glade | 100 ++--- dialogs/display-settings/display-dialog.glade | 382 dialogs/display-settings/extend-left.png | Bin 0 - 5205 bytes dialogs/display-settings/extend-right.png | Bin 0 - 5358 bytes .../display-settings/minimal-display-dialog.glade | 229 +++- dialogs/display-settings/mirror.png| Bin 0 - 8382 bytes 6 files changed, 417 insertions(+), 294 deletions(-) diff --git a/dialogs/display-settings/confirmation-dialog.glade b/dialogs/display-settings/confirmation-dialog.glade index dbf7c76..7b91c7a 100644 --- a/dialogs/display-settings/confirmation-dialog.glade +++ b/dialogs/display-settings/confirmation-dialog.glade @@ -1,26 +1,71 @@ -?xml version=1.0? +?xml version=1.0 encoding=UTF-8? interface - !-- interface-requires gtk+ 2.12 -- + requires lib=gtk+ version=2.24/ !-- interface-naming-policy project-wide -- object class=GtkDialog id=dialog1 +property name=can_focusFalse/property property name=border_width5/property property name=title translatable=yesConfirmation/property property name=resizableFalse/property property name=window_positioncenter/property property name=icon_namedialog-question/property property name=type_hintnormal/property -property name=has_separatorFalse/property child internal-child=vbox object class=GtkVBox id=dialog-vbox1 property name=visibleTrue/property -property name=orientationvertical/property +property name=can_focusFalse/property property name=spacing2/property +child internal-child=action_area + object class=GtkHButtonBox id=dialog-action_area1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkButton id=button2 +property name=label translatable=yesKeep this configuration/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=button1 +property name=label translatable=yesRestore the previous configuration/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property + /object + packing +property name=expandFalse/property +property name=fillFalse/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child child object class=GtkHBox id=hbox1 property name=visibleTrue/property +property name=can_focusFalse/property child object class=GtkImage id=image1 property name=visibleTrue/property +property name=can_focusFalse/property property name=xalign0.2000298023224/property property name=xpad10/property property name=stockgtk-dialog-question/property @@ -35,10 +80,11 @@ child object class=GtkVBox id=vbox1 property name=visibleTrue/property -property name=orientationvertical/property +property name=can_focusFalse/property child object class=GtkLabel id=label1 property name=visibleTrue/property +property name=can_focusFalse/property property name=xalign0/property property name=yalign0/property property name=ypad10/property @@ -54,6 +100,7 @@
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added Right-Of positioning.
Updating branch refs/heads/bluesabre/display-settings
to 59943ca568e9191fc5f9e91d25f3cfb3eb624473 (commit)
from 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f (commit)
commit 59943ca568e9191fc5f9e91d25f3cfb3eb624473
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 14:57:57 2012 -0400
Added Right-Of positioning.
dialogs/display-settings/main.c | 102 +++
1 file changed, 60 insertions(+), 42 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2d77156..350f3bb 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -142,24 +142,6 @@ display_settings_get_n_active_outputs (void)
}
static gboolean
-display_setting_combo_box_get_str (GtkComboBox *combobox,
- gchar **str)
-{
-GtkTreeModel *model;
-GtkTreeIter iter;
-
-if (gtk_combo_box_get_active_iter (combobox, iter))
-{
-model = gtk_combo_box_get_model (combobox);
-gtk_tree_model_get (model, iter, COLUMN_COMBO_VALUE, str, -1);
-
-return TRUE;
-}
-
-return FALSE;
-}
-
-static gboolean
display_setting_combo_box_get_value (GtkComboBox *combobox,
gint*value)
{
@@ -268,41 +250,70 @@ display_setting_positions_changed (GtkComboBox *combobox,
/* This part is incomplete. We should check if the display combobox is
also already selected, then move on with working with the specific
displays. */
-RRMode old_mode;
-gchar *value;
+gint value, current_display, selected_display, n;
+GObject *display_combobox;
+XfceRRMode *modes;
+
+display_combobox = gtk_builder_get_object(builder,
randr-active-displays);
-if (!display_setting_combo_box_get_str (combobox, value))
+if (!display_setting_combo_box_get_value (combobox, value))
return;
-/* Extend Left */
-if (g_strcmp0(value, left) == 0)
-{
+if (!display_setting_combo_box_get_value (GTK_COMBO_BOX(display_combobox),
selected_display))
+return;
+
+if (selected_display == -1) return;
+
+/* Store the Current Display */
+current_display = xfce_randr-active_output;
+/* FIXME: Extend Left (Move primary screen right/make secondary primary) */
+if (value == 0)
+{
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the right of the primary
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
+}
}
/* Extend Right */
-if (g_strcmp0(value, right) == 0)
+if (value == 1)
{
-
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the right of the secondary
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
+}
}
-
-/* Set new resolution */
-old_mode = XFCE_RANDR_MODE (xfce_randr);
-//XFCE_RANDR_MODE (xfce_randr) = value;
-
+
+/* Restore the current display to the primary display. */
+xfce_randr-active_output = current_display;
+
/* Apply the changes */
xfce_randr_save_output (xfce_randr, Default, display_channel,
xfce_randr-active_output);
xfce_randr_apply (xfce_randr, Default, display_channel);
-
-/* Ask user confirmation */
-if (!display_setting_timed_confirmation (builder))
-{
-XFCE_RANDR_MODE (xfce_randr) = old_mode;
-xfce_randr_save_output (xfce_randr, Default, display_channel,
-xfce_randr-active_output);
-xfce_randr_apply (xfce_randr, Default, display_channel);
-}
}
@@ -336,13 +347,13 @@ display_setting_positions_populate (GtkBuilder *builder)
gtk_list_store_append (GTK_LIST_STORE (model), iter);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
COLUMN_COMBO_NAME, _(left of),
-COLUMN_COMBO_VALUE, left,
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Initial dark background and rounded corners for popups.
Updating branch refs/heads/bluesabre/display-settings
to c396f9298a902094a5b5ffa69bc60e1461cf6015 (commit)
from 47c0e40e14e9ffbceccecdf090027f9050e1edfd (commit)
commit c396f9298a902094a5b5ffa69bc60e1461cf6015
Author: Sean Davis smd.seanda...@gmail.com
Date: Fri Oct 5 12:11:06 2012 -0400
Initial dark background and rounded corners for popups.
dialogs/display-settings/main.c | 86 ++-
1 file changed, 84 insertions(+), 2 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index cd9fa11..423228f 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -128,6 +128,7 @@ static gboolean bound_to_channel = FALSE;
XfceRandr *xfce_randr = NULL;
identity_popup_store display_popups;
+gboolean supports_alpha = FALSE;
static void
display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
@@ -990,6 +991,80 @@ display_setting_resolutions_populate (GtkBuilder *builder)
g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK
(display_setting_resolutions_changed), builder);
}
+static void
+display_setting_screen_changed(GtkWidget *widget, GdkScreen *old_screen,
gpointer userdata)
+{
+GdkScreen *screen = gtk_widget_get_screen(widget);
+GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+
+if (!colormap)
+{
+colormap = gdk_screen_get_rgb_colormap(screen);
+supports_alpha = FALSE;
+}
+else
+{
+supports_alpha = TRUE;
+}
+
+gtk_widget_set_colormap(widget, colormap);
+}
+
+static gboolean
+display_setting_identity_popup_expose(GtkWidget *popup, GdkEventExpose *event,
gpointer userdata)
+{
+cairo_t *cr = gdk_cairo_create(popup-window);
+gint radius;
+
+radius = 15;
+
+/* Compositing is not available, so just set the background color. */
+if (!supports_alpha)
+{
+cairo_set_source_rgb(cr, 0.2, 0.2, 0.2);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+}
+
+/* The radius is tiny, don't bother drawing rounded corners. */
+else if (radius 0.1) {
+cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+cairo_rectangle(cr, 0, 0, popup-allocation.width,
popup-allocation.height);
+}
+
+/* Draw rounded corners. FIXME Does not work with xfce compositor off. */
+else
+{
+cairo_set_source_rgba(cr, 0, 0, 0, 0);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_paint (cr);
+
+cairo_set_source_rgba(cr, 0.2, 0.2, 0.2, 0.9);
+
+cairo_move_to(cr, 0, radius);
+cairo_arc(cr, radius, radius, radius, 3.14, 3.0*3.14/2.0);
+cairo_line_to(cr, popup-allocation.width - radius, 0);
+cairo_arc(cr, popup-allocation.width - radius, radius, radius,
3.0*3.14/2.0, 0.0);
+//cairo_line_to(cr, popup-allocation.width, popup-allocation.height
- radius);
+cairo_line_to(cr, popup-allocation.width, popup-allocation.height);
+//cairo_arc(cr, popup-allocation.width - radius,
popup-allocation.height - radius, radius, 0.0, 3.14/2.0);
+//cairo_line_to(cr, radius, popup-allocation.height);
+cairo_line_to(cr, 0, popup-allocation.height);
+//cairo_arc(cr, radius, popup-allocation.height - radius, radius,
3.14/2.0, 3.14);
+cairo_stroke_preserve(cr);
+cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+cairo_fill(cr);
+cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+cairo_close_path(cr);
+}
+
+cairo_destroy (cr);
+
+return FALSE;
+}
+
static GtkWidget*
display_setting_identify_display (gint display_id,
GError *error)
@@ -1012,6 +1087,11 @@ display_setting_identify_display (gint display_id,
identity_popup_ui_length, error) != 0)
{
popup = (GtkWidget *) gtk_builder_get_object(builder, popup);
+
+gtk_widget_set_app_paintable(popup, TRUE);
+g_signal_connect( G_OBJECT(popup), expose-event,
G_CALLBACK(display_setting_identity_popup_expose), NULL );
+g_signal_connect( G_OBJECT(popup), screen-changed,
G_CALLBACK(display_setting_screen_changed), NULL );
+
display_name = gtk_builder_get_object(builder, display_name);
display_details = gtk_builder_get_object(builder, display_details);
@@ -1040,10 +1120,10 @@ display_setting_identify_display (gint display_id,
xfce_randr-output_info[display_id]-name);
gtk_label_set_markup (GTK_LABEL(display_name),
- g_strdup_printf(bigb%s: %s/b/big,
_(Display), name) );
+ g_strdup_printf(span
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Enhancements to minimal dialog, tweaked code to support new minimal dialog.
Updating branch refs/heads/bluesabre/display-settings
to 8d1ed825c1e739b63d87083401b4efdee357b09f (commit)
from 94c2d0fcec0fc2e3e6fbf66944172ca251f39067 (commit)
commit 8d1ed825c1e739b63d87083401b4efdee357b09f
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 05:39:00 2012 -0400
Enhancements to minimal dialog, tweaked code to support new minimal dialog.
dialogs/display-settings/main.c| 119 +---
.../display-settings/minimal-display-dialog.glade | 14 +--
2 files changed, 9 insertions(+), 124 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b6192b1..86dd15e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1140,90 +1140,6 @@ screen_on_event (GdkXEvent *xevent,
}
-
-static void
-display_settings_minimal_dialog_response (GtkDialog *dialog,
- gintresponse_id,
- GtkBuilder *builder)
-{
-GObject*first_screen_radio;
-GObject*second_screen_radio;
-XfceRRMode *mode1, *mode2;
-gbooleanuse_first_screen;
-gbooleanuse_second_screen;
-guint first, second;
-gintm, n, found;
-
-if (response_id == 1)
-{
-/* TODO: handle correctly more than 2 outputs? */
-first = 0;
-second = 1;
-
-first_screen_radio = gtk_builder_get_object (builder, radiobutton1);
-second_screen_radio = gtk_builder_get_object (builder, radiobutton2);
-
-use_first_screen =
-gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(first_screen_radio));
-use_second_screen =
-gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(second_screen_radio));
-
-if (use_first_screen)
-{
-xfce_randr-mode[first] = xfce_randr_preferred_mode (xfce_randr,
first);
-xfce_randr-mode[second] = None;
-}
-else if (use_second_screen)
-{
-xfce_randr-mode[second] = xfce_randr_preferred_mode (xfce_randr,
second);
-xfce_randr-mode[first] = None;
-}
-else
-{
-if (xfce_randr-clone_modes[0] != None)
-{
-xfce_randr-mode[first] = xfce_randr-clone_modes[0];
-xfce_randr-mode[second] = xfce_randr-clone_modes[0];
-}
-else
-{
-found = FALSE;
-/* No clone mode available, try to find a similar mode */
-for (n = 0; n xfce_randr-output_info[first]-nmode; ++n)
-{
-mode1 = xfce_randr-modes[first][n];
-for (m = 0; m xfce_randr-output_info[second]-nmode;
++m)
-{
-mode2 = xfce_randr-modes[second][m];
-/* similar means same resolution */
-if (mode1-width == mode2-width
- mode1-height == mode2-height)
-{
-xfce_randr-mode[first] = mode1-id;
-xfce_randr-mode[second] = mode2-id;
-found = TRUE;
-break;
-}
-}
-
-if (found)
-break;
-}
-}
-}
-/* Save the two outputs and apply */
-xfce_randr_save_output (xfce_randr, MinimalAutoConfig,
display_channel,
-first);
-xfce_randr_save_output (xfce_randr, MinimalAutoConfig,
display_channel,
-second);
-xfce_randr_apply (xfce_randr, MinimalAutoConfig, display_channel);
-}
-
-gtk_main_quit ();
-}
-
-
-
gint
main (gint argc, gchar **argv)
{
@@ -1235,7 +1151,6 @@ main (gint argc, gchar **argv)
GError *error = NULL;
gboolean succeeded = TRUE;
gint event_base, error_base;
-guintfirst, second;
gchar *command;
const gchar *alternative = NULL;
const gchar *alternative_icon = NULL;
@@ -1407,45 +1322,15 @@ main (gint argc, gchar **argv)
if (xfce_randr-noutput 2)
goto cleanup;
-/* TODO: handle correctly more than 2 outputs? */
-first = 0;
-second = 1;
-
builder = gtk_builder_new ();
if (gtk_builder_add_from_string (builder,
minimal_display_dialog_ui,
minimal_display_dialog_ui_length,
error) != 0)
{
-GObject*first_screen_radio;
-GObject*second_screen_radio;
-gchar *screen_name;
/* Build the minimal dialog */
-dialog = (GtkWidget *) gtk_builder_get_object (builder,
dialog1);
-
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Show Strv arrays in the renderer.
Updating branch refs/heads/bluesabre/display-settings
to afa79de4dfda99e58bb55efb07c021e6c71e9a6c (commit)
from eb85045030f7adc2bada1e989ece718a3a883533 (commit)
commit afa79de4dfda99e58bb55efb07c021e6c71e9a6c
Author: Nick Schermer n...@xfce.org
Date: Tue Oct 9 19:25:19 2012 +0200
Show Strv arrays in the renderer.
.../xfce-settings-cell-renderer.c | 37 ++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/xfce4-settings-editor/xfce-settings-cell-renderer.c
b/xfce4-settings-editor/xfce-settings-cell-renderer.c
index fd684a1..31e964e 100644
--- a/xfce4-settings-editor/xfce-settings-cell-renderer.c
+++ b/xfce4-settings-editor/xfce-settings-cell-renderer.c
@@ -108,7 +108,8 @@ static GtkCellEditable
*xfce_settings_cell_renderer_start_editing (GtkCellRender
GdkRectangle *background_area,
GdkRectangle *cell_area,
GtkCellRendererState flags);
-
+static void xfce_settings_strv_to_string (const
GValue *src_value,
+ GValue
*dest_value);
G_DEFINE_TYPE (XfceSettingsCellRenderer, xfce_settings_cell_renderer,
GTK_TYPE_CELL_RENDERER)
@@ -158,6 +159,9 @@ xfce_settings_cell_renderer_class_init
(XfceSettingsCellRendererClass *klass)
G_TYPE_VALUE);
edit_data_quark = g_quark_from_static_string (path);
+
+g_value_register_transform_func (G_TYPE_STRV, G_TYPE_STRING,
+ xfce_settings_strv_to_string);
}
@@ -282,7 +286,8 @@ xfce_settings_cell_renderer_prepare
(XfceSettingsCellRenderer *renderer)
const GValue *value = renderer-cell_value;
GValuestr_value = { 0, };
-if (G_VALUE_TYPE (value) == xfce_settings_array_type ())
+if (G_VALUE_TYPE (value) == xfce_settings_array_type ()
+|| G_VALUE_TYPE (value) == G_TYPE_STRV)
goto transform_value;
switch (G_VALUE_TYPE (value))
@@ -613,6 +618,34 @@ xfce_settings_array_to_string (const GValue *src_value,
+static void
+xfce_settings_strv_to_string (const GValue *src_value,
+ GValue *dest_value)
+{
+gchar **array = g_value_get_boxed (src_value);
+GString *str;
+guint i;
+
+g_return_if_fail (G_VALUE_HOLDS_STRING (dest_value));
+g_return_if_fail (array != NULL);
+
+str = g_string_new ([ );
+
+for (i = 0; array[i] != NULL; i++)
+{
+if (i 0)
+ g_string_append (str, , );
+g_string_append_printf (str, \%s\, array[i]);
+}
+
+g_string_append (str, ]);
+
+g_value_take_string (dest_value, g_string_free (str, FALSE));
+}
+
+
+
+
GtkCellRenderer *
xfce_settings_cell_renderer_new (void)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Changed to switch statement and static variables.
Updating branch refs/heads/bluesabre/display-settings
to f97545f2fd40630aff3adb67195315ff81321a14 (commit)
from 59943ca568e9191fc5f9e91d25f3cfb3eb624473 (commit)
commit f97545f2fd40630aff3adb67195315ff81321a14
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 15:43:56 2012 -0400
Changed to switch statement and static variables.
dialogs/display-settings/main.c | 76 -
dialogs/display-settings/xfce-randr.h |4 ++
2 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 350f3bb..2147c68 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -247,9 +247,6 @@ static void
display_setting_positions_changed (GtkComboBox *combobox,
GtkBuilder *builder)
{
-/* This part is incomplete. We should check if the display combobox is
- also already selected, then move on with working with the specific
- displays. */
gint value, current_display, selected_display, n;
GObject *display_combobox;
XfceRRMode *modes;
@@ -267,44 +264,45 @@ display_setting_positions_changed (GtkComboBox *combobox,
/* Store the Current Display */
current_display = xfce_randr-active_output;
-/* FIXME: Extend Left (Move primary screen right/make secondary primary) */
-if (value == 0)
-{
-/* Walk all supported modes of current display */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-/* Find the current mode. */
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+switch (value) {
+case XFCE_RANDR_PLACEMENT_LEFT: // Extend Left FIXME
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
{
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-/* Move the secondary display to the right of the primary
display. */
-XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
-break;
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the right of the primary
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
}
-}
-}
-
-/* Extend Right */
-if (value == 1)
-{
-/* Change active output to secondary display. */
-xfce_randr-active_output = selected_display;
-
-/* Find the current mode. */
-modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
-for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
-{
-if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+break;
+case XFCE_RANDR_PLACEMENT_RIGHT: // Extend Right
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
{
-/* Change active output to primary display. */
-xfce_randr-active_output = current_display;
-/* Move the primary display to the right of the secondary
display. */
-XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
-break;
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the right of the secondary
display. */
+XFCE_RANDR_POS_X (xfce_randr) = modes[n].width;
+break;
+}
}
-}
+break;
+case XFCE_RANDR_PLACEMENT_UP:
+case XFCE_RANDR_PLACEMENT_DOWN:
+default:
+break;
}
/* Restore the current display to the primary display. */
@@ -347,13 +345,13 @@ display_setting_positions_populate (GtkBuilder *builder)
gtk_list_store_append (GTK_LIST_STORE (model), iter);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
COLUMN_COMBO_NAME, _(left of),
-COLUMN_COMBO_VALUE, 0, -1);
+
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Beginning randr stuff for left/right.
Updating branch refs/heads/bluesabre/display-settings
to 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f (commit)
from 7ec05479b669a0bf9300101d692b79bf11ed1448 (commit)
commit 821122ba6d68e2a0d9c8f5f850b609bbbc3b661f
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 09:25:08 2012 -0400
Beginning randr stuff for left/right.
dialogs/display-settings/main.c | 57 ---
1 file changed, 53 insertions(+), 4 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index fccc3e0..2d77156 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -141,7 +141,23 @@ display_settings_get_n_active_outputs (void)
return count;
}
+static gboolean
+display_setting_combo_box_get_str (GtkComboBox *combobox,
+ gchar **str)
+{
+GtkTreeModel *model;
+GtkTreeIter iter;
+
+if (gtk_combo_box_get_active_iter (combobox, iter))
+{
+model = gtk_combo_box_get_model (combobox);
+gtk_tree_model_get (model, iter, COLUMN_COMBO_VALUE, str, -1);
+
+return TRUE;
+}
+return FALSE;
+}
static gboolean
display_setting_combo_box_get_value (GtkComboBox *combobox,
@@ -249,10 +265,45 @@ static void
display_setting_positions_changed (GtkComboBox *combobox,
GtkBuilder *builder)
{
-gint value;
+/* This part is incomplete. We should check if the display combobox is
+ also already selected, then move on with working with the specific
+ displays. */
+RRMode old_mode;
+gchar *value;
-if (!display_setting_combo_box_get_value (combobox, value))
+if (!display_setting_combo_box_get_str (combobox, value))
return;
+
+/* Extend Left */
+if (g_strcmp0(value, left) == 0)
+{
+
+}
+
+/* Extend Right */
+if (g_strcmp0(value, right) == 0)
+{
+
+}
+
+/* Set new resolution */
+old_mode = XFCE_RANDR_MODE (xfce_randr);
+//XFCE_RANDR_MODE (xfce_randr) = value;
+
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
+/* Ask user confirmation */
+if (!display_setting_timed_confirmation (builder))
+{
+XFCE_RANDR_MODE (xfce_randr) = old_mode;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+xfce_randr-active_output);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+}
+
}
static void
@@ -646,8 +697,6 @@ display_setting_refresh_rates_populate (GtkBuilder *builder)
g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK
(display_setting_refresh_rates_changed), builder);
}
-
-
static void
display_setting_resolutions_changed (GtkComboBox *combobox,
GtkBuilder *builder)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added above (broken) and below code.
Updating branch refs/heads/bluesabre/display-settings
to 37d456cf9f52bcddcf8d009af909ff4b69331bc2 (commit)
from f97545f2fd40630aff3adb67195315ff81321a14 (commit)
commit 37d456cf9f52bcddcf8d009af909ff4b69331bc2
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Sep 26 16:01:29 2012 -0400
Added above (broken) and below code.
dialogs/display-settings/main.c | 50 +++
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 2147c68..2c17dfe 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -299,8 +299,40 @@ display_setting_positions_changed (GtkComboBox *combobox,
}
}
break;
-case XFCE_RANDR_PLACEMENT_UP:
-case XFCE_RANDR_PLACEMENT_DOWN:
+case XFCE_RANDR_PLACEMENT_UP: // Extend Above
+/* Walk all supported modes of current display */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+/* Find the current mode. */
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+/* Move the secondary display to the above the primary
display. */
+XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
+break;
+}
+}
+break;
+case XFCE_RANDR_PLACEMENT_DOWN: // Extend Below
+/* Change active output to secondary display. */
+xfce_randr-active_output = selected_display;
+
+/* Find the current mode. */
+modes = XFCE_RANDR_SUPPORTED_MODES (xfce_randr);
+for (n = 0; n XFCE_RANDR_OUTPUT_INFO (xfce_randr)-nmode; ++n)
+{
+if (modes[n].id == XFCE_RANDR_MODE (xfce_randr))
+{
+/* Change active output to primary display. */
+xfce_randr-active_output = current_display;
+/* Move the primary display to the below the secondary
display. */
+XFCE_RANDR_POS_Y (xfce_randr) = modes[n].height;
+break;
+}
+}
+break;
default:
break;
}
@@ -352,6 +384,18 @@ display_setting_positions_populate (GtkBuilder *builder)
gtk_list_store_set (GTK_LIST_STORE (model), iter,
COLUMN_COMBO_NAME, _(right of),
COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_RIGHT, -1);
+
+/* Insert above */
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(above),
+COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_UP, -1);
+
+/* Insert below */
+gtk_list_store_append (GTK_LIST_STORE (model), iter);
+gtk_list_store_set (GTK_LIST_STORE (model), iter,
+COLUMN_COMBO_NAME, _(below),
+COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1);
/* Reconnect the signal */
@@ -755,8 +799,6 @@ display_setting_resolutions_populate (GtkBuilder *builder)
GtkTreeIteriter;
XfceRRMode *modes;
-g_print(get resolutions);
-
/* Get the combo box store and clear it */
combobox = gtk_builder_get_object (builder, randr-resolution);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
