[Xfce4-commits] xfce4-indicator-plugin:master l10n: Updated Serbian (sr) translation to 100%
Updating branch refs/heads/master to 7a58b3ddaf1c5ae8a0f0ebe4a622ed51d10f8613 (commit) from ad4a6391e01db9184b78c1fad7ade6fac345d34d (commit) commit 7a58b3ddaf1c5ae8a0f0ebe4a622ed51d10f8613 Author: Саша Петровић salepetron...@gmail.com Date: Mon Apr 15 13:28:08 2013 +0200 l10n: Updated Serbian (sr) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 47 +-- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/po/sr.po b/po/sr.po index 7a4387e..455ab7e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-04-05 07:15+\n +POT-Creation-Date: 2013-04-15 08:36+\n PO-Revision-Date: 2012-10-30 09:02+0100\n Last-Translator: salepetronije salepetron...@gmail.com\n Language-Team: српски xfce-i...@xfce.org\n @@ -73,14 +73,15 @@ msgstr Датум и време msgid Are you sure you want to clear the list of known indicators? msgstr Да ли сте сигурни да желите очистити списак познатих указивача? -#: ../panel-plugin/indicator-dialog.c:572 +#: ../panel-plugin/indicator-dialog.c:581 #, c-format msgid Unable to open the following url: %s msgstr Нисам успео да отворим следећу урл адресу: %s #: ../panel-plugin/indicator-dialog.glade.h:1 msgid iPlease restart the panel for visibility changes to take effect./i -msgstr iМолим, покрените поново полицу да би измене приказа ступиле на снагу./i +msgstr +iМолим, покрените поново полицу да би измене приказа ступиле на снагу./i #: ../panel-plugin/indicator-dialog.glade.h:2 msgid Align left in deskbar mode @@ -98,44 +99,62 @@ msgstr Очисти познате указиваче msgid Controls the indicator button layout when the panel is in a Deskbar mode. Possible choices are \centered\ or \aligned left\. -msgstr Управља размештајем дугмета указивача када је полица у начину приказа траке пулта. Могући избори су „у средини“ и „лево поравнање“. +msgstr +Управља размештајем дугмета указивача када је полица у начину приказа траке +пулта. Могући избори су „у средини“ и „лево поравнање“. #: ../panel-plugin/indicator-dialog.glade.h:6 +msgid Hidden +msgstr Скривен + +#: ../panel-plugin/indicator-dialog.glade.h:7 msgid Hide indicators by default msgstr Подразумевано скривај указиваче -#: ../panel-plugin/indicator-dialog.glade.h:7 +#: ../panel-plugin/indicator-dialog.glade.h:8 msgid Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon. -msgstr Величина икона је подешена да стане у један рд на полицу. Користите ову могућност да ограничите највећу величину приказа иконе. +msgstr +Величина икона је подешена да стане у један рд на полицу. Користите ову +могућност да ограничите највећу величину приказа иконе. -#: ../panel-plugin/indicator-dialog.glade.h:8 +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid Indicator +msgstr Указивач + +#: ../panel-plugin/indicator-dialog.glade.h:10 msgid Indicators msgstr Указивачи -#: ../panel-plugin/indicator-dialog.glade.h:9 +#: ../panel-plugin/indicator-dialog.glade.h:11 msgid Known Indicators msgstr Познати указивачи -#: ../panel-plugin/indicator-dialog.glade.h:10 +#: ../panel-plugin/indicator-dialog.glade.h:12 msgid Move the selected indicator one row down. msgstr Премести означени указивач један ред ниже. -#: ../panel-plugin/indicator-dialog.glade.h:11 +#: ../panel-plugin/indicator-dialog.glade.h:13 msgid Move the selected indicator one row up. msgstr Премести означени указивач један ред више. -#: ../panel-plugin/indicator-dialog.glade.h:12 +#: ../panel-plugin/indicator-dialog.glade.h:14 msgid Resets the list of indicators and their visibility settings. msgstr Врати на подразумевано списак указивача и њихове поставке видљивости. -#: ../panel-plugin/indicator-dialog.glade.h:13 +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid Visible +msgstr Видљив + +#: ../panel-plugin/indicator-dialog.glade.h:16 msgid When enabled, only indicators marked \Visible\ are shown. Otherwise, all indicators not marked \Hidden\ are displayed. -msgstr Када је омогућено, само указивачи означени као „видљиви“ се приказују. Иначе, сви указивачи који нису означени као „скривени“ се приказују. +msgstr +Када је омогућено, само указивачи означени као „видљиви“ се приказују. +Иначе, сви указивачи који нису означени као „скривени“ се приказују. -#: ../panel-plugin/indicator-dialog.glade.h:14 +#: ../panel-plugin/indicator-dialog.glade.h:17 msgid _Maximum icon size (px): msgstr Највећа величина икона (тачака): ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 57c95ed698fd53d33b3e8815aac6471917e59a50 (commit) from 7a58b3ddaf1c5ae8a0f0ebe4a622ed51d10f8613 (commit) commit 57c95ed698fd53d33b3e8815aac6471917e59a50 Author: jc jc1 jc1.quebe...@gmail.com Date: Mon Apr 15 16:23:32 2013 +0200 l10n: Updated French (fr) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 41 +++-- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/po/fr.po b/po/fr.po index 16da1b6..9496d50 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,22 +3,22 @@ # Copyright (C) 2009 Mark Trompell m...@foresightlinux.org # This file is distributed under the same license as the xfce4-indicator-plugin package. # Alexandre Franke alexandre.fra...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: \n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-04-06 04:39+\n +POT-Creation-Date: 2013-04-15 14:00+\n PO-Revision-Date: 2013-04-06 10:01+0100\n Last-Translator: \n Language-Team: French\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=2; plural=(n 1);\n -X-Generator: Poedit 1.5.4\n Language: french\n +Plural-Forms: nplurals=2; plural=(n 1);\n X-Poedit-SourceCharset: UTF-8\n +X-Generator: Poedit 1.5.4\n #: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid An indicator of something that needs your attention on the desktop @@ -36,7 +36,8 @@ msgstr Copyright (c) 2009-2013\n msgid No Indicators msgstr Aucun indicateur -#. raw name, pretty name, icon-name(?) +#. raw name, pretty name, +#. icon-name(?) #: ../panel-plugin/indicator-dialog.c:57 msgid Application Indicators msgstr Indicateur application @@ -73,7 +74,7 @@ msgstr Date et heure msgid Are you sure you want to clear the list of known indicators? msgstr Êtes-vous sûr de vouloir effacer la liste des indicateurs connus ? -#: ../panel-plugin/indicator-dialog.c:572 +#: ../panel-plugin/indicator-dialog.c:581 #, c-format msgid Unable to open the following url: %s msgstr Impossible d'ouvrir l'url suivante : %s @@ -106,10 +107,14 @@ msgstr gauche ». #: ../panel-plugin/indicator-dialog.glade.h:6 +msgid Hidden +msgstr Caché + +#: ../panel-plugin/indicator-dialog.glade.h:7 msgid Hide indicators by default msgstr Masquer les indicateurs par défaut -#: ../panel-plugin/indicator-dialog.glade.h:7 +#: ../panel-plugin/indicator-dialog.glade.h:8 msgid Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon. @@ -117,28 +122,36 @@ msgstr Les icônes sont mis à l'échelle pour s'adapter à une seule rangée de l'écran. Utiliser cette option pour définir la taille maximale de l'icône. -#: ../panel-plugin/indicator-dialog.glade.h:8 +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid Indicator +msgstr Indicateur + +#: ../panel-plugin/indicator-dialog.glade.h:10 msgid Indicators msgstr Indicateurs -#: ../panel-plugin/indicator-dialog.glade.h:9 +#: ../panel-plugin/indicator-dialog.glade.h:11 msgid Known Indicators msgstr Indicateur connus -#: ../panel-plugin/indicator-dialog.glade.h:10 +#: ../panel-plugin/indicator-dialog.glade.h:12 msgid Move the selected indicator one row down. msgstr Déplacer l'indicateur sélectionné une ligne vers le bas. -#: ../panel-plugin/indicator-dialog.glade.h:11 +#: ../panel-plugin/indicator-dialog.glade.h:13 msgid Move the selected indicator one row up. msgstr Déplacer l'indicateur sélectionné une ligne vers le haut. -#: ../panel-plugin/indicator-dialog.glade.h:12 +#: ../panel-plugin/indicator-dialog.glade.h:14 msgid Resets the list of indicators and their visibility settings. msgstr Réinitialise la liste des indicateurs et de leurs paramètres de visibilité. -#: ../panel-plugin/indicator-dialog.glade.h:13 +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid Visible +msgstr Visible + +#: ../panel-plugin/indicator-dialog.glade.h:16 msgid When enabled, only indicators marked \Visible\ are shown. Otherwise, all indicators not marked \Hidden\ are displayed. @@ -147,6 +160,6 @@ msgstr affichés. Dans le cas contraire, tous les indicateurs non marqués « Caché » sont affichés. -#: ../panel-plugin/indicator-dialog.glade.h:14 +#: ../panel-plugin/indicator-dialog.glade.h:17 msgid _Maximum icon size (px): msgstr Taille maximale d'une icône (pixel) : ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wmdock-plugin:0.6.x Added a function to get the current display on which is wmdock located.
Updating branch refs/heads/0.6.x
to dfca92e3613b7d672ca8d6c6b18ebee73103c83e (commit)
from 15016d8b2b5ec0910f6771d7badfdfa06b1150cf (commit)
commit dfca92e3613b7d672ca8d6c6b18ebee73103c83e
Author: Andre Ellguth an...@ellguth.com
Date: Thu Apr 4 21:20:50 2013 +0200
Added a function to get the current display on which is wmdock located.
panel-plugin/catchwindow.c | 12 ++--
panel-plugin/dockapp.c |2 +-
panel-plugin/misc.c| 22 ++
panel-plugin/misc.h|1 +
panel-plugin/wmdock.c |2 +-
5 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/panel-plugin/catchwindow.c b/panel-plugin/catchwindow.c
index 1266b66..2f73557 100644
--- a/panel-plugin/catchwindow.c
+++ b/panel-plugin/catchwindow.c
@@ -55,7 +55,7 @@ static gchar *wmdock_get_dockapp_cmd(WnckWindow *w)
FILE *procfp = NULL;
char buf[BUF_MAX];
- XGetCommand(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ XGetCommand(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
wnck_window_get_xid(w), argv, argc);
if(argc 0) {
argv = (char **) realloc(argv, sizeof(char *) * (argc + 1));
@@ -112,7 +112,7 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
gdk_error_trap_push();
gdk_flush();
- h = XGetWMHints(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ h = XGetWMHints(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
wnck_window_get_xid(w));
if(!h) return;
@@ -152,14 +152,14 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
}
if(h-initial_state == WithdrawnState h-icon_window) {
-
XUnmapWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+
XUnmapWindow(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
wnck_window_get_xid(w));
dapp-i =h-icon_window;
} else {
dapp-i = wnck_window_get_xid(w);
}
-
if(!XGetWindowAttributes(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+
if(!XGetWindowAttributes(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
dapp-i, attr)) {
wi = DEFAULT_DOCKAPP_WIDTH;
he = DEFAULT_DOCKAPP_HEIGHT;
@@ -171,7 +171,7 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
if(wi DEFAULT_DOCKAPP_WIDTH || he DEFAULT_DOCKAPP_HEIGHT) {
/* It seems to be no dockapp, because the width or the
height of the
* window a greater than 64 pixels. */
-
XMapWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+
XMapWindow(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
wnck_window_get_xid(w));
gtk_widget_destroy(GTK_WIDGET(dapp-s));
g_free(cmd);
@@ -198,7 +198,7 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
}
/* Cleanly unmap the original window. */
- XUnmapWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
dapp-i);
+ XUnmapWindow(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
dapp-i);
if(rcDapp == FALSE) {
dapp-tile = wmdock_create_tile_from_socket(dapp);
diff --git a/panel-plugin/dockapp.c b/panel-plugin/dockapp.c
index f81560d..8f32ea5 100644
--- a/panel-plugin/dockapp.c
+++ b/panel-plugin/dockapp.c
@@ -248,7 +248,7 @@ gboolean wmdock_startup_dockapp(const gchar *cmd)
void wmdock_destroy_dockapp(DockappNode *dapp)
{
debug(dockapp.c: Destroy dockapp %s, dapp-name);
- XDestroyWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
dapp-i);
+ XDestroyWindow(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()), dapp-i);
}
diff --git a/panel-plugin/misc.c b/panel-plugin/misc.c
index 5472a93..9d8ab89 100644
--- a/panel-plugin/misc.c
+++ b/panel-plugin/misc.c
@@ -65,7 +65,7 @@ void set_xsmp_support(WnckWindow *w)
XTextProperty tp;
static Atom _XA_SM_CLIENT_ID = None;
- _XA_SM_CLIENT_ID = XInternAtom
(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), SM_CLIENT_ID, False);
+ _XA_SM_CLIENT_ID = XInternAtom
(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()), SM_CLIENT_ID, False);
tp.value = (unsigned char *) strdup(SM_CLIENT_ID);
@@ -73,7 +73,7 @@ void set_xsmp_support(WnckWindow *w)
tp.format = 8;
tp.nitems = 1;
- XSetTextProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ XSetTextProperty(GDK_DISPLAY_XDISPLAY(get_current_gdkdisplay()),
wnck_window_get_xid(w),
tp, _XA_SM_CLIENT_ID);
@@ -145,7 +145,7 @@ gboolean has_dockapp_hint(WnckWindow *w)
[Xfce4-commits] xfce4-indicator-plugin:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 16a0cacdd172f490f16453cf4c1fb89fed930ce5 (commit) from 57c95ed698fd53d33b3e8815aac6471917e59a50 (commit) commit 16a0cacdd172f490f16453cf4c1fb89fed930ce5 Author: Pjotr vertaalt pjotrverta...@gmail.com Date: Mon Apr 15 19:06:30 2013 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 55 --- 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/po/nl.po b/po/nl.po index f178dc2..6b92601 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: xfce4-indicator-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-04-07 12:45+\n +POT-Creation-Date: 2013-04-15 14:00+\n PO-Revision-Date: 2011-06-16 16:21+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -73,14 +73,16 @@ msgstr Datum en tijd msgid Are you sure you want to clear the list of known indicators? msgstr Weet u zeker dat u de lijst van bekende indicatoren wil wissen? -#: ../panel-plugin/indicator-dialog.c:572 +#: ../panel-plugin/indicator-dialog.c:581 #, c-format msgid Unable to open the following url: %s msgstr Kon het volgende webadres niet openen: %s #: ../panel-plugin/indicator-dialog.glade.h:1 msgid iPlease restart the panel for visibility changes to take effect./i -msgstr iHerstart a.u.b. de werkbalk om de zichtbaarheidveranderingen door te voeren./i +msgstr +iHerstart a.u.b. de werkbalk om de zichtbaarheidveranderingen door te +voeren./i #: ../panel-plugin/indicator-dialog.glade.h:2 msgid Align left in deskbar mode @@ -98,44 +100,67 @@ msgstr Verwijder bekende indicatoren msgid Controls the indicator button layout when the panel is in a Deskbar mode. Possible choices are \centered\ or \aligned left\. -msgstr Beheerst de vormgeving van de indicatorknop wanneer de werkbalk in bureaubalkmodus is. Mogelijke keuzes zijn 'gecentreerd' of 'links uitgelijnd'. +msgstr +Beheerst de vormgeving van de indicatorknop wanneer de werkbalk in +bureaubalkmodus is. Mogelijke keuzes zijn 'gecentreerd' of 'links +uitgelijnd'. #: ../panel-plugin/indicator-dialog.glade.h:6 +msgid Hidden +msgstr Verborgen + +#: ../panel-plugin/indicator-dialog.glade.h:7 msgid Hide indicators by default msgstr Verberg standaard de indicatoren -#: ../panel-plugin/indicator-dialog.glade.h:7 +#: ../panel-plugin/indicator-dialog.glade.h:8 msgid Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon. -msgstr Pictogrammen worden geschaald om te passen op een enkele rij van de werkbalk. Gebruik deze optie om de maximumgrootte van het pictogram te beperken. +msgstr +Pictogrammen worden geschaald om te passen op een enkele rij van de +werkbalk. Gebruik deze optie om de maximumgrootte van het pictogram te +beperken. -#: ../panel-plugin/indicator-dialog.glade.h:8 +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid Indicator +msgstr Indicator + +#: ../panel-plugin/indicator-dialog.glade.h:10 msgid Indicators msgstr Indicatoren -#: ../panel-plugin/indicator-dialog.glade.h:9 +#: ../panel-plugin/indicator-dialog.glade.h:11 msgid Known Indicators msgstr Bekende indicatoren -#: ../panel-plugin/indicator-dialog.glade.h:10 +#: ../panel-plugin/indicator-dialog.glade.h:12 msgid Move the selected indicator one row down. msgstr Verplaats de gekozen indicator een rij naar beneden. -#: ../panel-plugin/indicator-dialog.glade.h:11 +#: ../panel-plugin/indicator-dialog.glade.h:13 msgid Move the selected indicator one row up. msgstr Verplaats de gekozen indicator een rij naar boven. -#: ../panel-plugin/indicator-dialog.glade.h:12 +#: ../panel-plugin/indicator-dialog.glade.h:14 msgid Resets the list of indicators and their visibility settings. -msgstr Zet de lijst van indicatoren en hun zichtbaarheidinstellingen terug op de standaardwaarden. +msgstr +Zet de lijst van indicatoren en hun zichtbaarheidinstellingen terug op de +standaardwaarden. -#: ../panel-plugin/indicator-dialog.glade.h:13 +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid Visible +msgstr Zichtbaar + +#: ../panel-plugin/indicator-dialog.glade.h:16 msgid When enabled, only indicators marked \Visible\ are shown. Otherwise, all indicators not marked \Hidden\ are displayed. -msgstr Wanneer ingeschakeld, worden er alleen indicatoren getoond met de markering 'Zichtbaar'. Anders worden alle indicatoren zonder de markering 'Verborgen' getoond. +msgstr +Wanneer ingeschakeld, worden er alleen indicatoren getoond met de markering +'Zichtbaar'. Anders worden alle indicatoren zonder de markering 'Verborgen' +getoond. -#: ../panel-plugin/indicator-dialog.glade.h:14 +#: ../panel-plugin/indicator-dialog.glade.h:17 msgid _Maximum icon size (px): msgstr Maximale pictogramgrootte (px):
[Xfce4-commits] xfce4-panel:nick/gtk3 Revert Workaround for PanelImage and GtkButton conflict (image size growing on click/hover)
Updating branch refs/heads/nick/gtk3 to ae4447d399aa111ba53ef9d317f7c1cf2709352c (commit) from a6b01d8b5dda51c8eedae4aa2c35627037719117 (commit) commit ae4447d399aa111ba53ef9d317f7c1cf2709352c Author: Andrzej ndrwr...@gmail.com Date: Mon Apr 15 19:45:17 2013 +0100 Revert Workaround for PanelImage and GtkButton conflict (image size growing on click/hover) This reverts commit a6b01d8b5dda51c8eedae4aa2c35627037719117. libxfce4panel/xfce-panel-convenience.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c index ae55ccb..43a3c08 100644 --- a/libxfce4panel/xfce-panel-convenience.c +++ b/libxfce4panel/xfce-panel-convenience.c @@ -58,7 +58,7 @@ xfce_panel_create_button (void) GtkWidget *button = gtk_button_new (); gtk_widget_set_can_default (GTK_WIDGET (button), FALSE); - gtk_widget_set_can_focus (GTK_WIDGET (button), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); gtk_widget_set_name (button, xfce-panel-button); @@ -82,7 +82,7 @@ xfce_panel_create_toggle_button (void) GtkWidget *button = gtk_toggle_button_new (); gtk_widget_set_can_default (GTK_WIDGET (button), FALSE); - gtk_widget_set_can_focus (GTK_WIDGET (button), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); gtk_widget_set_name (button, xfce-panel-toggle-button); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 PanelImage: reworked workaround for GtkButton sizing issue.
Updating branch refs/heads/nick/gtk3
to 24bb01b13ddc57b77e6ddf14900a70f801d2c958 (commit)
from ae4447d399aa111ba53ef9d317f7c1cf2709352c (commit)
commit 24bb01b13ddc57b77e6ddf14900a70f801d2c958
Author: Andrzej ndrwr...@gmail.com
Date: Mon Apr 15 21:34:04 2013 +0100
PanelImage: reworked workaround for GtkButton sizing issue.
It should now work in all scenarios (custom buttons, can_focus=FALSE etc.)
libxfce4panel/xfce-panel-image.c | 48 ++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 7acb239..6d9687d 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -308,6 +308,48 @@ xfce_panel_image_finalize (GObject *object)
+//#if GTK_CHECK_VERSION (3, 0, 0) !GTK_CHECK_VERSION (3, 10, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define GTK_BUTTON_SIZING_FIX
+#endif
+
+#ifdef GTK_BUTTON_SIZING_FIX
+/* When can_focus is true, GtkButton allocates larger size than requested *
+ * and causes the panel image to grow indefinitely. *
+ * This workaround compensates for this difference. *
+ * Details in https://bugzilla.gnome.org/show_bug.cgi?id=698030 *
+ */
+static gint
+xfce_panel_image_padding_correction (GtkWidget *widget)
+{
+ GtkWidget *parent;
+ GtkStyleContext *context;
+ gint focus_width;
+ gint focus_pad;
+ gint correction;
+
+ parent = gtk_widget_get_parent (widget);
+ if (parent != NULL
+ GTK_IS_BUTTON (parent)
+ !gtk_widget_get_can_focus (parent))
+{
+ context = gtk_widget_get_style_context (parent);
+ gtk_style_context_get_style (context,
+ focus-line-width, focus_width,
+ focus-padding, focus_pad,
+ NULL);
+ correction = (focus_width + focus_pad) * 2;
+}
+ else
+{
+ correction = 0;
+}
+
+ return correction;
+}
+#endif
+
+
#if GTK_CHECK_VERSION (3, 0, 0)
static void
xfce_panel_image_get_preferred_width (GtkWidget *widget,
@@ -324,6 +366,9 @@ xfce_panel_image_get_preferred_width (GtkWidget *widget,
else
{
gtk_widget_get_allocation (widget, alloc);
+#ifdef GTK_BUTTON_SIZING_FIX
+ alloc.width -= xfce_panel_image_padding_correction (widget);
+#endif
*minimal_width = alloc.width;
}
@@ -347,6 +392,9 @@ xfce_panel_image_get_preferred_height (GtkWidget *widget,
else
{
gtk_widget_get_allocation (widget, alloc);
+#ifdef GTK_BUTTON_SIZING_FIX
+ alloc.height -= xfce_panel_image_padding_correction (widget);
+#endif
*minimal_height = alloc.height;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/gtk3 Creating branch andrzejr/gtk3
Updating branch refs/heads/andrzejr/gtk3 as new branch to 0622d8f3a0d4af2a4fe3679a0546e0ec55a76345 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/andrzejr/gtk3 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/gtk3 Depend on gtk3 libraries.
Updating branch refs/heads/andrzejr/gtk3 to 83a29466cd47dfae0f75778d5dff1222939f1207 (commit) from 010cda8acb001de443deb42381efdbe47c910a69 (commit) commit 83a29466cd47dfae0f75778d5dff1222939f1207 Author: Nick Schermer n...@xfce.org Date: Mon Feb 4 16:50:54 2013 +0100 Depend on gtk3 libraries. configure.ac.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 27943c1..b8cecd0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -128,15 +128,15 @@ dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.5]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.0.0]) -XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) +XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-3.0], [3.0]) dnl ** dnl *** Optional GIO UNIX features *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:andrzejr/gtk3 Quick hack for compiling libxfce4-panel and wrapper w/gtk3
Updating branch refs/heads/andrzejr/gtk3
to 0622d8f3a0d4af2a4fe3679a0546e0ec55a76345 (commit)
from 83a29466cd47dfae0f75778d5dff1222939f1207 (commit)
commit 0622d8f3a0d4af2a4fe3679a0546e0ec55a76345
Author: Andrzej ndrwr...@gmail.com
Date: Thu Mar 14 02:46:42 2013 +
Quick hack for compiling libxfce4-panel and wrapper w/gtk3
Makefile.am|6 +++-
libxfce4panel/Makefile.am |5 +---
libxfce4panel/xfce-panel-convenience.c |8 -
libxfce4panel/xfce-panel-plugin.c | 27 +--
wrapper/main.c |4 +++
wrapper/wrapper-plug.c | 43 +---
wrapper/wrapper-plug.h |6
7 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0ad0780..9a5063a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,16 @@
SUBDIRS = \
libxfce4panel \
common \
- panel \
- plugins \
wrapper \
migrate \
docs \
icons \
po
+# panel \
+# plugins \
+#
+
distclean-local:
rm -rf *.spec *.cache *~
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index cba5083..f65e85c 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -24,7 +24,6 @@ libxfce4panel_headers = \
libxfce4panel.h \
libxfce4panel-config.h \
libxfce4panel-enums.h \
- xfce-arrow-button.h \
xfce-hvbox.h \
xfce-panel-convenience.h \
xfce-panel-macros.h \
@@ -44,12 +43,10 @@ libxfce4panel_1_0_la_SOURCES = \
$(libxfce4panel_built_sources) \
$(libxfce4panel_headers) \
libxfce4panel-config.c \
- xfce-arrow-button.c \
xfce-hvbox.c \
xfce-panel-convenience.c \
xfce-panel-plugin.c \
- xfce-panel-plugin-provider.c \
- xfce-panel-image.c
+ xfce-panel-plugin-provider.c
libxfce4panel_1_0_la_CFLAGS = \
$(GTK_CFLAGS) \
diff --git a/libxfce4panel/xfce-panel-convenience.c
b/libxfce4panel/xfce-panel-convenience.c
index a3f3be1..34e21f3 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -57,7 +57,9 @@ xfce_panel_create_button (void)
{
GtkWidget *button = gtk_button_new ();
- GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ //GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_widget_set_name (button, xfce-panel-button);
@@ -80,7 +82,9 @@ xfce_panel_create_toggle_button (void)
{
GtkWidget *button = gtk_toggle_button_new ();
- GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ //GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
+ gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_widget_set_name (button, xfce-panel-toggle-button);
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index 8126922..e649ff3 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -28,6 +28,7 @@
#endif
#include gtk/gtk.h
+#include gtk/gtkx.h
#include glib.h
#include libxfce4util/libxfce4util.h
@@ -2411,6 +2412,7 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin
*plugin,
gint*y)
{
GtkRequisition requisition;
+ GtkAllocation allocation;
GdkScreen *screen;
GdkRectanglemonitor;
gintmonitor_num;
@@ -2428,11 +2430,11 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin
*plugin,
attach_widget = GTK_WIDGET (plugin);
/* make sure the menu is realized to get valid rectangle sizes */
- if (!GTK_WIDGET_REALIZED (menu_widget))
+ if (!gtk_widget_get_realized (menu_widget))
gtk_widget_realize (menu_widget);
/* make sure the attach widget is realized for the gdkwindow */
- if (!GTK_WIDGET_REALIZED (attach_widget))
+ if (!gtk_widget_get_realized (attach_widget))
gtk_widget_realize (attach_widget);
/* get the menu/widget size request */
@@ -2446,8 +2448,13 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin
*plugin,
plug = gtk_widget_get_ancestor (attach_widget, GTK_TYPE_PLUG);
if (plug != NULL)
{
- gdk_window_get_geometry (gtk_plug_get_socket_window (GTK_PLUG (plug)),
+#if GTK_CHECK_VERSION(3,0,0)
+ gdk_window_get_geometry (gtk_plug_get_socket_window (GTK_PLUG (plug)),
+px, py, NULL, NULL);
+#else
+
[Xfce4-commits] xfce4-panel:andrzejr/gtk3 Deleting branch andrzejr/gtk3
Deleting branch refs/heads/andrzejr/gtk3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/gtk3 PanelImage: fixes to previous commit and cleanup.
Updating branch refs/heads/nick/gtk3
to e8ca9eea79ee65068edc43b8fc4b2236833de8c8 (commit)
from 24bb01b13ddc57b77e6ddf14900a70f801d2c958 (commit)
commit e8ca9eea79ee65068edc43b8fc4b2236833de8c8
Author: Andrzej ndrwr...@gmail.com
Date: Mon Apr 15 23:31:45 2013 +0100
PanelImage: fixes to previous commit and cleanup.
Correction has to be done in all cases, not only when the requested
size is derived from allocation.
libxfce4panel/xfce-panel-image.c | 46 +++--
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 6d9687d..5d17419 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -116,10 +116,10 @@ static void xfce_panel_image_set_property
(GObject *object
static void xfce_panel_image_finalize (GObject
*object);
#if GTK_CHECK_VERSION (3, 0, 0)
static void xfce_panel_image_get_preferred_width (GtkWidget
*widget,
- gint
*minimal_width,
+ gint
*minimum_width,
gint
*natural_width);
static void xfce_panel_image_get_preferred_height (GtkWidget
*widget,
- gint
*minimal_height,
+ gint
*minimum_height,
gint
*natural_height);
#else
static void xfce_panel_image_size_request (GtkWidget
*widget,
@@ -353,52 +353,64 @@ xfce_panel_image_padding_correction (GtkWidget *widget)
#if GTK_CHECK_VERSION (3, 0, 0)
static void
xfce_panel_image_get_preferred_width (GtkWidget *widget,
- gint *minimal_width,
+ gint *minimum_width,
gint *natural_width)
{
XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
GtkAllocation alloc;
+ gint width;
if (priv-size 0)
-*minimal_width = priv-size;
+width = priv-size;
else if (priv-pixbuf != NULL)
-*minimal_width = gdk_pixbuf_get_width (priv-pixbuf);
+width = gdk_pixbuf_get_width (priv-pixbuf);
else
{
gtk_widget_get_allocation (widget, alloc);
+ width = alloc.width;
+}
+
#ifdef GTK_BUTTON_SIZING_FIX
- alloc.width -= xfce_panel_image_padding_correction (widget);
+ width -= xfce_panel_image_padding_correction (widget);
#endif
- *minimal_width = alloc.width;
-}
- *natural_width = *minimal_width;
+ if (minimum_width != NULL)
+*minimum_width = width;
+
+ if (natural_width != NULL)
+*natural_width = width;
}
static void
xfce_panel_image_get_preferred_height (GtkWidget *widget,
- gint *minimal_height,
+ gint *minimum_height,
gint *natural_height)
{
XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
GtkAllocation alloc;
+ gint height;
if (priv-size 0)
-*minimal_height = priv-size;
+height = priv-size;
else if (priv-pixbuf != NULL)
-*minimal_height = gdk_pixbuf_get_height (priv-pixbuf);
+height = gdk_pixbuf_get_height (priv-pixbuf);
else
{
gtk_widget_get_allocation (widget, alloc);
+ height = alloc.height;
+}
+
#ifdef GTK_BUTTON_SIZING_FIX
- alloc.height -= xfce_panel_image_padding_correction (widget);
+ height -= xfce_panel_image_padding_correction (widget);
#endif
- *minimal_height = alloc.height;
-}
- *natural_height = *minimal_height;
+ if (minimum_height != NULL)
+*minimum_height = height;
+
+ if (natural_height != NULL)
+*natural_height = height;
}
#endif
@@ -481,7 +493,6 @@ xfce_panel_image_draw (GtkWidget *widget,
GdkPixbuf *rendered = NULL;
GdkPixbuf *pixbuf = priv-cache;
GtkStyleContext *context;
- GtkAllocation alloc;
if (G_LIKELY (pixbuf != NULL))
{
@@ -490,7 +501,6 @@ xfce_panel_image_draw (GtkWidget *widget,
source_height = gdk_pixbuf_get_height (pixbuf);
/* position */
- gtk_widget_get_allocation (widget, alloc);
dest_x = (priv-width - source_width) / 2;
dest_y = (priv-height - source_height) / 2;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:master l10n: Updated Croatian (hr) translation to 25%
Updating branch refs/heads/master to 41f9ea9168927ec9d9c0299e0330ac28f288a149 (commit) from 16a0cacdd172f490f16453cf4c1fb89fed930ce5 (commit) commit 41f9ea9168927ec9d9c0299e0330ac28f288a149 Author: Ivica Kolić ik...@yahoo.com Date: Tue Apr 16 07:30:13 2013 +0200 l10n: Updated Croatian (hr) translation to 25% New status: 8 messages complete with 0 fuzzies and 23 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 32 ++-- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/po/hr.po b/po/hr.po index ed14420..77f7b56 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce-indicator-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-04-06 04:39+\n +POT-Creation-Date: 2013-04-16 00:48+\n PO-Revision-Date: 2011-05-21 13:02+0100\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian ik...@yahoo.com\n @@ -74,7 +74,7 @@ msgstr msgid Are you sure you want to clear the list of known indicators? msgstr -#: ../panel-plugin/indicator-dialog.c:572 +#: ../panel-plugin/indicator-dialog.c:581 #, c-format msgid Unable to open the following url: %s msgstr @@ -102,41 +102,53 @@ msgid msgstr #: ../panel-plugin/indicator-dialog.glade.h:6 -msgid Hide indicators by default +msgid Hidden msgstr #: ../panel-plugin/indicator-dialog.glade.h:7 +msgid Hide indicators by default +msgstr + +#: ../panel-plugin/indicator-dialog.glade.h:8 msgid Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon. msgstr -#: ../panel-plugin/indicator-dialog.glade.h:8 +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid Indicator +msgstr Indikator + +#: ../panel-plugin/indicator-dialog.glade.h:10 msgid Indicators msgstr Indikatori -#: ../panel-plugin/indicator-dialog.glade.h:9 +#: ../panel-plugin/indicator-dialog.glade.h:11 msgid Known Indicators msgstr Poznati indikatori -#: ../panel-plugin/indicator-dialog.glade.h:10 +#: ../panel-plugin/indicator-dialog.glade.h:12 msgid Move the selected indicator one row down. msgstr -#: ../panel-plugin/indicator-dialog.glade.h:11 +#: ../panel-plugin/indicator-dialog.glade.h:13 msgid Move the selected indicator one row up. msgstr -#: ../panel-plugin/indicator-dialog.glade.h:12 +#: ../panel-plugin/indicator-dialog.glade.h:14 msgid Resets the list of indicators and their visibility settings. msgstr -#: ../panel-plugin/indicator-dialog.glade.h:13 +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid Visible +msgstr + +#: ../panel-plugin/indicator-dialog.glade.h:16 msgid When enabled, only indicators marked \Visible\ are shown. Otherwise, all indicators not marked \Hidden\ are displayed. msgstr -#: ../panel-plugin/indicator-dialog.glade.h:14 +#: ../panel-plugin/indicator-dialog.glade.h:17 msgid _Maximum icon size (px): msgstr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
