[Xfce4-commits] garcon:master l10n: Updated Polish (pl) translation to 100%
Updating branch refs/heads/master to 60577ca5be023260dd0ab8f14a206456e065652f (commit) from 23d50b8fee53ec106426723fa1b90ff8e003fc37 (commit) commit 60577ca5be023260dd0ab8f14a206456e065652f Author: Piotr Sokół pso...@jabster.pl Date: Thu Jun 10 10:55:52 2010 +0200 l10n: Updated Polish (pl) translation to 100% New status: 28 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 79 + 1 files changed, 38 insertions(+), 41 deletions(-) diff --git a/po/pl.po b/po/pl.po index d471553..ea2a2d0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,134 +1,132 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Piotr Sokół piotr.so...@10g.pl, 2009. -# +# Piotr Sokół pso...@jabster.pl, 2010. msgid msgstr -Project-Id-Version: libxfce4menu\n +Project-Id-Version: garcon\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-04-28 23:51+0200\n -PO-Revision-Date: 2009-01-29 13:18+0100\n -Last-Translator: Piotr Sokół piotr.so...@10g.pl\n -Language-Team: Polish\n +POT-Creation-Date: 2010-05-31 16:02+\n +PO-Revision-Date: 2010-06-04 14:32+0200\n +Last-Translator: Piotr Sokół pso...@jabster.pl\n +Language-Team: Polish \n MIME-Version: 1.0\n -Content-Type: text/plain; charset=utf-8\n -Content-Transfer-Encoding: 8bit\n +Content-Type: text/plain; charset=\n +Content-Transfer-Encoding: \n #: ../data/xfce/xfce-accessories.directory.in.h:1 msgid Accessories -msgstr +msgstr Akcesoria #: ../data/xfce/xfce-accessories.directory.in.h:2 msgid Common desktop tools and applications -msgstr +msgstr Obejmuje narzędzia i programy użytkowe #: ../data/xfce/xfce-development.directory.in.h:1 msgid Development -msgstr +msgstr Programowanie #: ../data/xfce/xfce-development.directory.in.h:2 msgid Software development tools -msgstr +msgstr Zawiera narzędzia programistyczne #: ../data/xfce/xfce-education.directory.in.h:1 msgid Education -msgstr +msgstr Edukacja #: ../data/xfce/xfce-education.directory.in.h:2 msgid Educational software -msgstr +msgstr Przechowuje oprogramowanie edukacyjne #: ../data/xfce/xfce-games.directory.in.h:1 msgid Games -msgstr +msgstr Gry #: ../data/xfce/xfce-games.directory.in.h:2 msgid Games, puzzles, and other fun software -msgstr +msgstr Gromadzi gry i inne oprogramowanie rozrywkowe #: ../data/xfce/xfce-graphics.directory.in.h:1 msgid Graphics -msgstr +msgstr Grafika #: ../data/xfce/xfce-graphics.directory.in.h:2 msgid Graphics creation and manipulation applications -msgstr +msgstr Przechowuje programy służące do tworzenia i modyfikowania grafiki #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid Audio and video players and editors -msgstr +msgstr Obejmuje odtwarzacze oraz edytory dźwięku i wideo #: ../data/xfce/xfce-multimedia.directory.in.h:2 msgid Multimedia -msgstr +msgstr Multimedia #: ../data/xfce/xfce-network.directory.in.h:1 msgid Network -msgstr +msgstr Sieć #: ../data/xfce/xfce-network.directory.in.h:2 msgid Network applications and utilities -msgstr +msgstr Gromadzi programy i narzędzia sieciowe #: ../data/xfce/xfce-office.directory.in.h:1 msgid Office -msgstr +msgstr Biuro #: ../data/xfce/xfce-office.directory.in.h:2 msgid Office and productivity applications -msgstr +msgstr Programy biurowe #: ../data/xfce/xfce-other.directory.in.h:1 msgid Applications that don't fit into other categories -msgstr +msgstr Zawiera programy nie pasujące do innych kategorii #: ../data/xfce/xfce-other.directory.in.h:2 msgid Other -msgstr +msgstr Inne #: ../data/xfce/xfce-science.directory.in.h:1 msgid Science -msgstr +msgstr Nauka #: ../data/xfce/xfce-science.directory.in.h:2 msgid Scientific software -msgstr +msgstr Zawiera oprogramowanie naukowe #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid Screensaver applets -msgstr +msgstr Gromadzi aplety wygaszacza ekranu #: ../data/xfce/xfce-screensavers.directory.in.h:2 msgid Screensavers -msgstr +msgstr Wygaszacze ekranu #: ../data/xfce/xfce-settings.directory.in.h:1 msgid Desktop and system settings applications -msgstr +msgstr Obejmuje programy do zarządzania ustawieniami systemu i pulpitu #: ../data/xfce/xfce-settings.directory.in.h:2 msgid Settings -msgstr +msgstr Ustawienia #: ../data/xfce/xfce-system.directory.in.h:1 msgid System -msgstr +msgstr System #: ../data/xfce/xfce-system.directory.in.h:2 msgid System tools and utilities -msgstr +msgstr Przechowuje narzędzia do zarządzania systemem #: ../garcon/garcon-menu-parser.c:278 -#, fuzzy, c-format +#, c-format msgid Could not load menu file data from %s: %s -msgstr -Nie udało się wczytać pamięci podręcznej elementu libxfce4menu z %s: %s. +msgstr Nie udało się wczytać pliku menu %s: %s #:
[Xfce4-commits] xfce4-settings:xrandr-display-settings Ignore disconnected outputs
Updating branch refs/heads/xrandr-display-settings
to 0765e3b70ee82cf5bc05ae213fa862d725a1aea6 (commit)
from 1beb4f649894d10f1418d987a9cbcfa36be8bf08 (commit)
commit 0765e3b70ee82cf5bc05ae213fa862d725a1aea6
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 21:52:46 2010 +0200
Ignore disconnected outputs
xfce4-settings-helper/displays.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 4991ac6..59ffb83 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -264,7 +264,8 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
{
output_info = XRRGetOutputInfo (xdisplay, resources,
resources-outputs[m]);
-if (g_strcmp0 (output_info-name, output_name) != 0)
+if (output_info-connection != RR_Connected
+|| g_strcmp0 (output_info-name, output_name) != 0)
{
XRRFreeOutputInfo (output_info);
continue;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xrandr-display-settings Simplify the case when an output has to be disabled
Updating branch refs/heads/xrandr-display-settings
to 8e17715cf8074a03ec5ff9d7371ddb6e12d3b3b8 (commit)
from 0765e3b70ee82cf5bc05ae213fa862d725a1aea6 (commit)
commit 8e17715cf8074a03ec5ff9d7371ddb6e12d3b3b8
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 22:07:33 2010 +0200
Simplify the case when an output has to be disabled
xfce4-settings-helper/displays.c | 75 +++---
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 59ffb83..4c00d51 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -165,6 +165,24 @@ xfce_displays_helper_finalize (GObject *object)
#ifdef HAS_RANDR_ONE_POINT_TWO
+static Status
+xfce_displays_helper_disable_crtc (Display*xdisplay,
+ XRRScreenResources *resources,
+ RRCrtc crtc)
+{
+g_return_val_if_fail (xdisplay != NULL, RRSetConfigSuccess);
+g_return_val_if_fail (resources != NULL, RRSetConfigSuccess);
+
+/* already disabled */
+if (crtc == None)
+return RRSetConfigSuccess;
+
+return XRRSetCrtcConfig (xdisplay, resources, crtc, CurrentTime,
+ 0, 0, None, RR_Rotate_0, NULL, 0);
+}
+
+
+
static void
xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper,
const gchar*scheme)
@@ -176,7 +194,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
gchar property[512];
gintmin_width, min_height, max_width, max_height;
gintmm_width, mm_height, width, height;
-gintj, l, m, n, num_outputs, output_rot, noutput;
+gintj, l, m, n, num_outputs, output_rot;
#ifdef HAS_RANDR_ONE_POINT_THREE
gintis_primary;
#endif
@@ -188,7 +206,6 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
gdouble rate;
RRMode mode;
Rotationrot;
-RROutput *outputs;
/* flush x and trap errors */
gdk_flush ();
@@ -271,6 +288,17 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
continue;
}
+/* outputs that have to be disabled are stored without resolution
*/
+if (output_res == NULL)
+{
+if (xfce_displays_helper_disable_crtc (xdisplay, resources,
+ output_info-crtc) !=
RRSetConfigSuccess)
+g_warning (Failed to disable CRTC for output %s.,
output_info-name);
+
+XRRFreeOutputInfo (output_info);
+break;
+}
+
/* walk supported modes */
mode = None;
for (l = 0; l output_info-nmode; ++l)
@@ -303,7 +331,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
}
/* unsupported mode, abort for this output */
-if (mode == None output_res != NULL)
+if (mode == None)
{
XRRFreeOutputInfo (output_info);
break;
@@ -324,45 +352,18 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
/* check if we really need to do something */
if (crtc_info-mode != mode || crtc_info-rotation != rot)
{
-/* resolution was NULL, so the user wants to disable this
output */
-if (mode == None)
-{
-outputs = g_new0 (RROutput, crtc_info-noutput - 1);
-noutput = 0;
-/* to disable the output, remove it from the list of
outputs connected to this crtc */
-for (l = 0; l crtc_info-noutput; ++l)
-{
-if (crtc_info-outputs[l] == resources-outputs[m])
-continue;
-
-outputs[noutput++] = crtc_info-outputs[l];
-}
-}
-else
-{
-noutput = crtc_info-noutput;
-outputs = crtc_info-outputs;
-}
+/* get the physical sizes of the output */
+mm_width += output_info-mm_width;
+mm_height += output_info-mm_height;
-/* do not change the screen size if the output is going to
be disabled */
-if (mode != None)
-{
-/* get the physical sizes of the output */
-mm_width += output_info-mm_width;
-mm_height += output_info-mm_height;
-
-
xfce4-settings:xrandr-display-settings If the output is rotated (90 or 270°), switch height and width
Updating branch refs/heads/xrandr-display-settings
to 4c0b06462c4e28feb6ab04c9f74226ee947a9c81 (commit)
from 8e17715cf8074a03ec5ff9d7371ddb6e12d3b3b8 (commit)
commit 4c0b06462c4e28feb6ab04c9f74226ee947a9c81
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 22:13:30 2010 +0200
If the output is rotated (90 or 270°), switch height and width
xfce4-settings-helper/displays.c | 12 ++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 4c00d51..91777b6 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -357,8 +357,16 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
mm_height += output_info-mm_height;
/* get the sizes of the mode to enforce */
-width += resources-modes[j].width;
-height += resources-modes[j].height;
+if (rot == RR_Rotate_0 || rot == RR_Rotate_180)
+{
+width += resources-modes[j].width;
+height += resources-modes[j].height;
+}
+else
+{
+height += resources-modes[j].width;
+width += resources-modes[j].height;
+}
if (XRRSetCrtcConfig (xdisplay, resources,
output_info-crtc,
crtc_info-timestamp, crtc_info-x,
crtc_info-y,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xrandr-display-settings Reenable an output if needed
Updating branch refs/heads/xrandr-display-settings
to d51f05a018746cf50950585ac5d03963ad02af9c (commit)
from 4c0b06462c4e28feb6ab04c9f74226ee947a9c81 (commit)
commit d51f05a018746cf50950585ac5d03963ad02af9c
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 22:20:54 2010 +0200
Reenable an output if needed
xfce4-settings-helper/displays.c | 39 -
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 91777b6..6a9d3e7 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -194,7 +194,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
gchar property[512];
gintmin_width, min_height, max_width, max_height;
gintmm_width, mm_height, width, height;
-gintj, l, m, n, num_outputs, output_rot;
+gintj, l, m, n, num_outputs, output_rot, noutput;
#ifdef HAS_RANDR_ONE_POINT_THREE
gintis_primary;
#endif
@@ -205,7 +205,9 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
XRRModeInfo*mode_info;
gdouble rate;
RRMode mode;
+RRCrtc crtc;
Rotationrot;
+RROutput *outputs;
/* flush x and trap errors */
gdk_flush ();
@@ -337,9 +339,23 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
break;
}
+crtc = None;
if (output_info-crtc != None)
{
-crtc_info = XRRGetCrtcInfo (xdisplay, resources,
output_info-crtc);
+/* Good, output already enabled */
+crtc = output_info-crtc;
+}
+else if (output_info-ncrtc 0)
+{
+/* output previously disabled, and the user wants to reenable
it */
+crtc = output_info-crtcs[0];
+}
+else
+g_warning (No CRTC found for %s., output_info-name);
+
+if (crtc != None)
+{
+crtc_info = XRRGetCrtcInfo (xdisplay, resources, crtc);
/* unsupported rotation, abort for this output */
if ((crtc_info-rotations rot) == 0)
@@ -349,6 +365,19 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
break;
}
+if (output_info-crtc != None)
+{
+/* already connected and enabled */
+noutput = crtc_info-noutput;
+outputs = crtc_info-outputs;
+}
+else
+{
+/* currently disabled, so take the current output */
+noutput = 1;
+outputs = resources-outputs[m];
+}
+
/* check if we really need to do something */
if (crtc_info-mode != mode || crtc_info-rotation != rot)
{
@@ -368,16 +397,14 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
width += resources-modes[j].height;
}
-if (XRRSetCrtcConfig (xdisplay, resources,
output_info-crtc,
+if (XRRSetCrtcConfig (xdisplay, resources, crtc,
crtc_info-timestamp, crtc_info-x,
crtc_info-y,
- mode, rot, crtc_info-outputs,
crtc_info-noutput) != RRSetConfigSuccess)
+ mode, rot, outputs, noutput) !=
RRSetConfigSuccess)
g_warning (Failed to configure %s.,
output_info-name);
}
XRRFreeCrtcInfo (crtc_info);
}
-else
-g_warning (No CRTC found for %s., output_info-name);
XRRFreeOutputInfo (output_info);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xrandr-display-settings Rework the detection of the current values
Updating branch refs/heads/xrandr-display-settings
to 17cc24fa6771064481a9019d20b8f509e46c3e37 (commit)
from ddea3c1d570df8cbb239ea5c6b13879646089160 (commit)
commit 17cc24fa6771064481a9019d20b8f509e46c3e37
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 22:30:40 2010 +0200
Rework the detection of the current values
Take only the global server config if we are sure that no CRTC at all is
connected to this output. If there is a disabled CRTC connected to it, take
the
values from this one, so if we decide to enable it later, these values will
be
valid (e.g., we will know which exact rotations are supported).
dialogs/display-settings/xfce-randr.c | 58 -
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/dialogs/display-settings/xfce-randr.c
b/dialogs/display-settings/xfce-randr.c
index 0de624a..0fb2f3f 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -43,6 +43,7 @@ xfce_randr_new (GdkDisplay *display,
Display*xdisplay;
GdkWindow *root_window;
XRRScreenConfiguration *screen_config;
+RRCrtc crtc;
XRRCrtcInfo*crtc_info;
gintn;
gintmajor, minor;
@@ -118,38 +119,49 @@ xfce_randr_new (GdkDisplay *display,
return NULL;
}
-/* load defaults */
-randr-preferred_mode[n] =
randr-output_info[n]-modes[randr-output_info[n]-npreferred];
-
-if (randr-output_info[n]-crtc != None)
-{
-crtc_info = XRRGetCrtcInfo (xdisplay, randr-resources,
randr-output_info[n]-crtc);
-randr-mode[n] = crtc_info-mode;
-randr-rotation[n] = crtc_info-rotation;
-randr-rotations[n] = crtc_info-rotations;
-XRRFreeCrtcInfo (crtc_info);
-}
-else
-{
-randr-mode[n] = None;
-screen_config = XRRGetScreenInfo (xdisplay, GDK_WINDOW_XID
(root_window));
-randr-rotations[n] = XRRConfigRotations (screen_config,
randr-rotation[n]);
-XRRFreeScreenConfigInfo (screen_config);
-}
-
+/* do not query disconnected outputs */
if (randr-output_info[n]-connection == RR_Connected)
{
+/* load defaults */
+randr-preferred_mode[n] =
randr-output_info[n]-modes[randr-output_info[n]-npreferred];
+
#ifdef HAS_RANDR_ONE_POINT_THREE
+/* find the primary screen if supported */
if (randr-has_1_3 XRRGetOutputPrimary (xdisplay,
GDK_WINDOW_XID (root_window)) == randr-resources-outputs[n])
-{
randr-status[n] = XFCE_OUTPUT_STATUS_PRIMARY;
+else
+#endif
+randr-status[n] = XFCE_OUTPUT_STATUS_SECONDARY;
+
+crtc = None;
+if (randr-output_info[n]-crtc != None)
+{
+/* connected to an active CRTC, take it */
+crtc = randr-output_info[n]-crtc;
+}
+else if (randr-output_info[n]-ncrtc 0)
+{
+/* otherwise, take a possible CRTC instead */
+crtc = randr-output_info[n]-crtcs[0];
+}
+
+if (crtc != None)
+{
+crtc_info = XRRGetCrtcInfo (xdisplay, randr-resources, crtc);
+randr-mode[n] = crtc_info-mode;
+randr-rotation[n] = crtc_info-rotation;
+randr-rotations[n] = crtc_info-rotations;
+XRRFreeCrtcInfo (crtc_info);
continue;
}
-#endif
-randr-status[n] = XFCE_OUTPUT_STATUS_SECONDARY;
}
-}
+/* at this point, the output is obviously disabled and disconnected,
so take the global config */
+randr-mode[n] = None;
+screen_config = XRRGetScreenInfo (xdisplay, GDK_WINDOW_XID
(root_window));
+randr-rotations[n] = XRRConfigRotations (screen_config,
randr-rotation[n]);
+XRRFreeScreenConfigInfo (screen_config);
+}
return randr;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xrandr-display-settings Add initial support for extended mode
Updating branch refs/heads/xrandr-display-settings
to 032591e71c96d333aec0a13de307ac0c2105a053 (commit)
from 17cc24fa6771064481a9019d20b8f509e46c3e37 (commit)
commit 032591e71c96d333aec0a13de307ac0c2105a053
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Tue Jun 8 22:50:50 2010 +0200
Add initial support for extended mode
It adds the ability to detect the outputs' relative positions and store
them in
xfconf. It's probably not that beautiful, but at least it works with two
outputs, and well, it's a start.
dialogs/display-settings/xfce-randr.c | 83 ++---
dialogs/display-settings/xfce-randr.h | 41 +++--
2 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/dialogs/display-settings/xfce-randr.c
b/dialogs/display-settings/xfce-randr.c
index 0fb2f3f..d123a73 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -35,6 +35,45 @@
#ifdef HAS_RANDR_ONE_POINT_TWO
+static void
+xfce_randr_compute_position (XfceRandr *randr,
+ gint *pos_x,
+ gint *pos_y)
+{
+gint m, n;
+
+for (n = 0; n randr-resources-noutput; ++n)
+{
+randr-position[n].output = -1;
+
+if (randr-status[n] == XFCE_OUTPUT_STATUS_NONE || randr-mode[n] ==
None)
+continue;
+
+for (m = 0; m randr-resources-noutput; ++m)
+{
+if (randr-status[m] == XFCE_OUTPUT_STATUS_NONE || m == n
+|| randr-mode[m] == None)
+continue;
+
+randr-position[n].output = m;
+if (pos_x[n] pos_x[m])
+randr-position[n].option = XFCE_OUTPUT_POSITION_LEFT_OF;
+else if (pos_x[n] pos_x[m])
+randr-position[n].option = XFCE_OUTPUT_POSITION_RIGHT_OF;
+else if (pos_y[n] pos_y[m])
+randr-position[n].option = XFCE_OUTPUT_POSITION_ABOVE;
+else if (pos_y[n] pos_y[m])
+randr-position[n].option = XFCE_OUTPUT_POSITION_BELOW;
+else
+randr-position[n].option = XFCE_OUTPUT_POSITION_SAME_AS;
+
+break;
+}
+}
+}
+
+
+
XfceRandr *
xfce_randr_new (GdkDisplay *display,
GError **error)
@@ -47,6 +86,7 @@ xfce_randr_new (GdkDisplay *display,
XRRCrtcInfo*crtc_info;
gintn;
gintmajor, minor;
+gint *pos_x, *pos_y;
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -95,7 +135,11 @@ xfce_randr_new (GdkDisplay *display,
randr-position = g_new0 (XfceOutputPosition, randr-resources-noutput);
randr-status = g_new0 (XfceOutputStatus, randr-resources-noutput);
randr-output_info = g_new0 (XRROutputInfo *, randr-resources-noutput);
-
+
+/* keep track of the positions */
+pos_x = g_new0 (gint, randr-resources-noutput);
+pos_y = g_new0 (gint, randr-resources-noutput);
+
/* walk the outputs */
for (n = 0; n randr-resources-noutput; n++)
{
@@ -152,6 +196,8 @@ xfce_randr_new (GdkDisplay *display,
randr-rotation[n] = crtc_info-rotation;
randr-rotations[n] = crtc_info-rotations;
XRRFreeCrtcInfo (crtc_info);
+pos_x[n] = crtc_info-x;
+pos_y[n] = crtc_info-y;
continue;
}
}
@@ -162,6 +208,10 @@ xfce_randr_new (GdkDisplay *display,
randr-rotations[n] = XRRConfigRotations (screen_config,
randr-rotation[n]);
XRRFreeScreenConfigInfo (screen_config);
}
+
+/* compute the relative positions of outputs */
+xfce_randr_compute_position (randr, pos_x, pos_y);
+
return randr;
}
@@ -238,7 +288,7 @@ xfce_randr_save_device (XfceRandr *randr,
const gchar *resolution_name = NULL;
gdouble refresh_rate = 0.00;
XRRModeInfo *mode;
-const gchar *position_name;
+const gchar *position_option;
gint n;
gint degrees;
@@ -303,27 +353,26 @@ xfce_randr_save_device (XfceRandr *randr,
xfconf_channel_reset_property (channel, property, FALSE);
#endif
-/* save the position */
+/* first, remove any existing position */
g_snprintf (property, sizeof (property), /%s/%s/Position, scheme,
distinct);
-if (randr-layout == XFCE_DISPLAY_LAYOUT_EXTEND
- randr-status[output] == XFCE_OUTPUT_STATUS_SECONDARY)
+xfconf_channel_reset_property (channel, property, TRUE);
+/* then save the new one */
+if (G_LIKELY (resolution_name != NULL)
+ randr-position[output].output = 0
+ randr-position[output].output randr-resources-noutput)
{
/* convert the position into a string */
-switch (randr-position[output])
+switch
[Xfce4-commits] midori:master Remove toolbar menu items from the compact menu
Updating branch refs/heads/master
to 61c5514c1c9d0637e4273c54eb8d1c6a96ee46da (commit)
from ff6fec636700b71b296ebe5c2976b8cb7080d292 (commit)
commit 61c5514c1c9d0637e4273c54eb8d1c6a96ee46da
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 10 17:53:08 2010 +0200
Remove toolbar menu items from the compact menu
midori/midori-browser.c |7 +--
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 920a7b8..bf001fe 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3367,12 +3367,6 @@ _action_compact_menu_populate_popup (GtkAction*
action,
{ Find },
#else
{ Print },
- { About },
- { NULL },
- { Menubar },
- { Bookmarkbar },
- { Panel },
- { Statusbar },
{ NULL },
{ - },
{ ClearPrivateData },
@@ -3381,6 +3375,7 @@ _action_compact_menu_populate_popup (GtkAction*
action,
#endif
{ Fullscreen },
#endif
+ { About },
{ Preferences },
#if HAVE_HILDON
{ auto-load-images },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use g_file_set_contents to save 'config' with a temporary file
Updating branch refs/heads/master
to ff6fec636700b71b296ebe5c2976b8cb7080d292 (commit)
from 5333845ba45e2c709e50418ee28310b9693b648f (commit)
commit ff6fec636700b71b296ebe5c2976b8cb7080d292
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jun 10 17:49:22 2010 +0200
Use g_file_set_contents to save 'config' with a temporary file
If the filesystem runs out of space and Midori tries to save
the 'config' file under that condition, the file is lost. To
avoid that, we use g_file_set_contents which writes a temporary
file first, at the cost of destroying symbolic links.
midori/sokoke.c | 13 +++--
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 04c37af..e8ade3a 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1103,22 +1103,15 @@ sokoke_key_file_save_to_file (GKeyFile*key_file,
GError** error)
{
gchar* data;
-FILE* fp;
+gboolean success = FALSE;
data = g_key_file_to_data (key_file, NULL, error);
if (!data)
return FALSE;
-if (!(fp = fopen (filename, w)))
-{
-*error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES,
- _(Writing failed.));
-return FALSE;
-}
-fputs (data, fp);
-fclose (fp);
+success = g_file_set_contents (filename, data, -1, error);
g_free (data);
-return TRUE;
+return success;
}
void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Remove a useless warning from the systray.
Updating branch refs/heads/master
to 655e11d8cadda8357e5315ab10e2bc5a8cab64f3 (commit)
from 9b964cf8528b74ab0d5b8e27c8bc3787001c2e9f (commit)
commit 655e11d8cadda8357e5315ab10e2bc5a8cab64f3
Author: Nick Schermer n...@xfce.org
Date: Thu Jun 10 19:06:03 2010 +0200
Remove a useless warning from the systray.
plugins/systray/systray-manager.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugins/systray/systray-manager.c
b/plugins/systray/systray-manager.c
index 11731b1..1cfa938 100644
--- a/plugins/systray/systray-manager.c
+++ b/plugins/systray/systray-manager.c
@@ -448,13 +448,13 @@ systray_manager_unregister (SystrayManager *manager)
/* remove our handling of the selection if we're the owner */
owner = gdk_selection_owner_get_for_display (display,
manager-selection_atom);
- if (owner != invisible-window
- || !gdk_selection_owner_set_for_display (display,
- NULL,
- manager-selection_atom,
- gdk_x11_get_server_time
(invisible-window),
- TRUE))
-panel_assert_not_reached ();
+ if (owner == invisible-window)
+{
+ gdk_selection_owner_set_for_display (display, NULL,
+ manager-selection_atom,
+ gdk_x11_get_server_time
(invisible-window),
+ TRUE);
+}
/* remove window filter */
gdk_window_remove_filter (invisible-window,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xrandr-display-settings Improve the code to find an available crtc
Updating branch refs/heads/xrandr-display-settings
to 9d3cd50eea8a0fe318d3b4437cbe17f000df950e (commit)
from 032591e71c96d333aec0a13de307ac0c2105a053 (commit)
commit 9d3cd50eea8a0fe318d3b4437cbe17f000df950e
Author: Lionel Le Folgoc mrpo...@gmail.com
Date: Thu Jun 10 19:37:08 2010 +0200
Improve the code to find an available crtc
Instead of taking the first one (that can be used by another output
already),
check for a possible free crtc.
xfce4-settings-helper/displays.c | 68 ++---
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index 6a9d3e7..2a95f2f 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -165,6 +165,60 @@ xfce_displays_helper_finalize (GObject *object)
#ifdef HAS_RANDR_ONE_POINT_TWO
+static RRCrtc
+xfce_displays_helper_find_crtc (Display*xdisplay,
+XRRScreenResources *resources,
+XRROutputInfo *current_output)
+{
+XRROutputInfo *output_info;
+gint m, n, candidate;
+
+g_return_val_if_fail (current_output != NULL, None);
+
+/* if there is one already active, return it */
+if (current_output-crtc != None)
+return current_output-crtc;
+
+g_return_val_if_fail (resources != NULL, None);
+
+/* try to find one that is not already used by another output */
+for (n = 0; n current_output-ncrtc; ++n)
+{
+candidate = TRUE;
+for (m = 0; m resources-noutput; ++m)
+{
+output_info = XRRGetOutputInfo (xdisplay, resources,
resources-outputs[m]);
+
+/* go to the next output directly */
+if (output_info-connection != RR_Connected
+|| g_strcmp0 (output_info-name, current_output-name) == 0)
+{
+XRRFreeOutputInfo (output_info);
+continue;
+}
+
+/* crtc already used */
+if (output_info-crtc == current_output-crtcs[n])
+{
+candidate = FALSE;
+XRRFreeOutputInfo (output_info);
+break;
+}
+
+XRRFreeOutputInfo (output_info);
+}
+
+if (candidate)
+return current_output-crtcs[n];
+}
+
+/* none available */
+g_warning (No CRTC found for %s., current_output-name);
+return None;
+}
+
+
+
static Status
xfce_displays_helper_disable_crtc (Display*xdisplay,
XRRScreenResources *resources,
@@ -339,19 +393,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
break;
}
-crtc = None;
-if (output_info-crtc != None)
-{
-/* Good, output already enabled */
-crtc = output_info-crtc;
-}
-else if (output_info-ncrtc 0)
-{
-/* output previously disabled, and the user wants to reenable
it */
-crtc = output_info-crtcs[0];
-}
-else
-g_warning (No CRTC found for %s., output_info-name);
+crtc = xfce_displays_helper_find_crtc (xdisplay, resources,
output_info);
if (crtc != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
