[Xfce4-commits] Continue reordering via DND. It sort of works but is unfinished.
Updating branch refs/heads/jannis/new-shortcuts-pane
to 5d320f84075019e4a61e8abf79ca0705f74bc399 (commit)
from 7695d02ce8ab279163c23fb24e5d3d46493fae4e (commit)
commit 5d320f84075019e4a61e8abf79ca0705f74bc399
Author: Jannis Pohlmann
Date: Sun Dec 25 02:55:13 2011 +0100
Continue reordering via DND. It sort of works but is unfinished.
We should probably drop the GtkVBox for the shortcuts in a
ThunarShortcutGroup and just implement the layout mechanism inside the
group. That would allow us to fake the empty spot indicator instead of
using a real GtkImage widget. The empty spot indicator is cool as it
delivers a feeling of direct manipulation. However, using a real widget
causes a mix of ThunarShortcut and GtkImage widgets inside the vertical
box of the group, which is kind of ugly. We should just render the
indicator but not use a real widget.
Other than that, reordering via DND works now. Shortcuts only
temporarily remain in their new positions until the ThunarShortcutsView
is destroyed. Windows are out of sync.
thunar/thunar-enum-types.c |5 +-
thunar/thunar-enum-types.h |1 +
thunar/thunar-shortcut-group.c | 416 ++--
thunar/thunar-shortcut-group.h |5 -
thunar/thunar-shortcut.c | 43 +++--
thunar/thunar-shortcut.h | 109 ++-
6 files changed, 394 insertions(+), 185 deletions(-)
diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c
index 4ede8f2..355af7f 100644
--- a/thunar/thunar-enum-types.c
+++ b/thunar/thunar-enum-types.c
@@ -371,8 +371,9 @@ thunar_dnd_target_get_type (void)
{
static const GEnumValue values[] =
{
-{ THUNAR_DND_TARGET_SHORTCUT, "THUNAR_DND_TARGET_SHORTCUT",
"shortcut", },
-{ 0, NULL, NULL,
},
+{ THUNAR_DND_TARGET_SHORTCUT, "THUNAR_DND_TARGET_SHORTCUT",
"shortcut", },
+{ THUNAR_DND_TARGET_TEXT_URI_LIST, "THUNAR_DND_TARGET_TEXT_URI_LIST",
"text/uri-list" },
+{ 0, NULL,
NULL, },
};
type = g_enum_register_static (I_("ThunarDNDTarget"), values);
diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h
index b25014b..944573e 100644
--- a/thunar/thunar-enum-types.h
+++ b/thunar/thunar-enum-types.h
@@ -325,6 +325,7 @@ GType thunar_shortcut_type_get_type (void) G_GNUC_CONST;
typedef enum
{
THUNAR_DND_TARGET_SHORTCUT,
+ THUNAR_DND_TARGET_TEXT_URI_LIST,
} ThunarDNDTarget;
GType thunar_dnd_target_get_type (void) G_GNUC_CONST;
diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c
index 159a047..114fb85 100644
--- a/thunar/thunar-shortcut-group.c
+++ b/thunar/thunar-shortcut-group.c
@@ -48,32 +48,49 @@ enum
-static void thunar_shortcut_group_constructed (GObject
*object);
-static void thunar_shortcut_group_dispose (GObject
*object);
-static void thunar_shortcut_group_finalize (GObject
*object);
-static void thunar_shortcut_group_get_property (GObject
*object,
- guint
prop_id,
- GValue
*value,
- GParamSpec
*pspec);
-static void thunar_shortcut_group_set_property (GObject
*object,
- guint
prop_id,
- const GValue
*value,
- GParamSpec
*pspec);
-static void thunar_shortcut_group_drag_leave(GtkWidget
*widget,
- GdkDragContext
*context,
- guint
timestamp);
-static gboolean thunar_shortcut_group_drag_motion (GtkWidget
*widget,
- GdkDragContext
*context,
- gint
x,
- gint
y,
- guint
timestamp);
-static void thunar_shortcut_group_attract_attention (ThunarShortcutGroup
*group);
-static gboolean thunar_shortcut_group_flash_expander(gpointer
user_data);
-static void thunar_shortcut_group_expand_style_set (ThunarShortcutGroup
*group,
- GtkStyle
*style,
[Xfce4-commits] Update translators, week 51.
Updating branch refs/heads/master to 54af3917e22633c235346c9a22735419e057a55f (commit) from eec6c2bb82b3c6b2e330655cbfc65a27ad65f77b (commit) commit 54af3917e22633c235346c9a22735419e057a55f Author: Transifex Date: Sun Dec 25 00:00:12 2011 +0100 Update translators, week 51. lib/translators.php |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/lib/translators.php b/lib/translators.php index f6696a9..1b90077 100644 --- a/lib/translators.php +++ b/lib/translators.php @@ -4,7 +4,7 @@ * DO NOT EDIT IT MANUALLY! */ -$translators_stamp = "2011-12-18 00:00:14"; +$translators_stamp = "2011-12-25 00:00:12"; $translators = array ( 'Amharic [am]' => array ( @@ -89,14 +89,17 @@ $translators = array ( 'Esperanto [eo]' => array ( 'Michael Moroni' => 'michael'.DOTSIGN.'moroni'.ATSIGN.'mailoo'.DOTSIGN.'org', 'Jakob Pedersen' => 'jakobp78'.ATSIGN.'gmail'.DOTSIGN.'com', +'Pierre Vittet' => 'pierre-vittet'.ATSIGN.'pvittet'.DOTSIGN.'com', 'Aleksandr Ponomarenko' => 'davian818'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Spanish (Castilian) [es]' => array ( 'Andres Sanchez' => 'afsanchez93'.ATSIGN.'gmail'.DOTSIGN.'com', 'Abel Martín' => 'abel'.DOTSIGN.'martin'.DOTSIGN.'ruiz'.ATSIGN.'gmail'.DOTSIGN.'com', 'brunella capilongo broussard' => 'circe28'.ATSIGN.'libero'.DOTSIGN.'it', +'Daniel Durante' => 'danieldurante'.ATSIGN.'ymail'.DOTSIGN.'com', 'Javier Sánchez Reinosa' => 'donoban'.ATSIGN.'gmail'.DOTSIGN.'com', 'Ignacio Velasco' => 'elega'.ATSIGN.'elega'.DOTSIGN.'com'.DOTSIGN.'ar', +'el_sync' => 'elsyncmiami'.ATSIGN.'gmail'.DOTSIGN.'com', 'Ernesto Chavez' => 'ernestoc33'.ATSIGN.'gmail'.DOTSIGN.'com', 'Esteban Vidal González' => 'esteban70x7'.ATSIGN.'yahoo'.DOTSIGN.'es', 'Adolfo Jayme Barrientos' => 'fitoschido'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -107,7 +110,9 @@ $translators = array ( ), 'Spanish (Argentinian) [es_AR]' => array ( 'Diego Augusto Molina' => 'diegoaugustomolina'.ATSIGN.'gmail'.DOTSIGN.'com', +'Manuel Fernando Aponte Guzmán' => 'manuelferchis'.ATSIGN.'gmail'.DOTSIGN.'com', 'Santiago Quiroga' => 'santiago'.DOTSIGN.'j'.DOTSIGN.'quiroga'.ATSIGN.'gmail'.DOTSIGN.'com', +'C'.DOTSIGN.' Sebastian Biscussi' => 'sebastian'.DOTSIGN.'csb'.ATSIGN.'gmail'.DOTSIGN.'com', 'vtamara' => 'vtamara'.ATSIGN.'pasosdeJesus'.DOTSIGN.'org', ), 'Estonian [et]' => array ( @@ -117,6 +122,7 @@ $translators = array ( 'Piarres Beobide' => 'pi'.ATSIGN.'beobide'.DOTSIGN.'net', ), 'Persian [fa]' => array ( +'anonxero' => 'anonxero'.ATSIGN.'linuxmail'.DOTSIGN.'org', 'Mehdi Esmaeelpour' => 'ariarat'.ATSIGN.'gmail'.DOTSIGN.'com', 'Ehsan Akhlaghi' => 'esnka'.ATSIGN.'yahoo'.DOTSIGN.'com', ), @@ -213,6 +219,7 @@ $translators = array ( 'Mohd'.DOTSIGN.' Nadzrin Sapari' => 'terjemah'.DOTSIGN.'puretech'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Norwegian Bokmal [nb]' => array ( +'takoi' => 'thomas'.DOTSIGN.'amland'.ATSIGN.'gmail'.DOTSIGN.'com', 'Terje Uriansrud' => 'terje'.ATSIGN.'uriansrud'.DOTSIGN.'net', ), 'Dutch (Flemish) [nl]' => array ( ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update translators, week 51.
Updating branch refs/heads/master
to f5c350ea8ac4a1ffadb57e6b5b5544c0a341c557 (commit)
from 7bdbdb116b822aa69def8456a115b4d5e683eec6 (commit)
commit f5c350ea8ac4a1ffadb57e6b5b5544c0a341c557
Author: Transifex
Date: Sun Dec 25 00:00:10 2011 +0100
Update translators, week 51.
xfce4-about/translators.h |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 9cf61e6..a90c747 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include
#include
-#define TRANSLATORS_H_STAMP "2011-12-18 00:00:05"
+#define TRANSLATORS_H_STAMP "2011-12-25 00:00:04"
#define ATSIGN "@"
#define DOTSIGN "."
@@ -166,6 +166,7 @@ static const TranslatorInfo xfce_translators_eo[] =
{
{ "Michael Moroni", "michael" DOTSIGN "moroni" ATSIGN "mailoo" DOTSIGN
"org", TRUE },
{ "Jakob Pedersen", "jakobp78" ATSIGN "gmail" DOTSIGN "com", FALSE },
+ { "Pierre Vittet", "pierre-vittet" ATSIGN "pvittet" DOTSIGN "com", FALSE },
{ "Aleksandr Ponomarenko", "davian818" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ NULL, NULL }
};
@@ -175,8 +176,10 @@ static const TranslatorInfo xfce_translators_es[] =
{ "Andres Sanchez", "afsanchez93" ATSIGN "gmail" DOTSIGN "com", TRUE },
{ "Abel Martín", "abel" DOTSIGN "martin" DOTSIGN "ruiz" ATSIGN "gmail"
DOTSIGN "com", TRUE },
{ "brunella capilongo broussard", "circe28" ATSIGN "libero" DOTSIGN "it",
FALSE },
+ { "Daniel Durante", "danieldurante" ATSIGN "ymail" DOTSIGN "com", FALSE },
{ "Javier Sánchez Reinosa", "donoban" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ignacio Velasco", "elega" ATSIGN "elega" DOTSIGN "com" DOTSIGN "ar",
FALSE },
+ { "el_sync", "elsyncmiami" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ernesto Chavez", "ernestoc33" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Esteban Vidal González", "esteban70x7" ATSIGN "yahoo" DOTSIGN "es", FALSE
},
{ "Adolfo Jayme Barrientos", "fitoschido" ATSIGN "gmail" DOTSIGN "com",
FALSE },
@@ -190,7 +193,9 @@ static const TranslatorInfo xfce_translators_es[] =
static const TranslatorInfo xfce_translators_es_AR[] =
{
{ "Diego Augusto Molina", "diegoaugustomolina" ATSIGN "gmail" DOTSIGN "com",
FALSE },
+ { "Manuel Fernando Aponte Guzmán", "manuelferchis" ATSIGN "gmail" DOTSIGN
"com", FALSE },
{ "Santiago Quiroga", "santiago" DOTSIGN "j" DOTSIGN "quiroga" ATSIGN
"gmail" DOTSIGN "com", FALSE },
+ { "C" DOTSIGN " Sebastian Biscussi", "sebastian" DOTSIGN "csb" ATSIGN
"gmail" DOTSIGN "com", FALSE },
{ "vtamara", "vtamara" ATSIGN "pasosdeJesus" DOTSIGN "org", FALSE },
{ NULL, NULL }
};
@@ -209,6 +214,7 @@ static const TranslatorInfo xfce_translators_eu[] =
static const TranslatorInfo xfce_translators_fa[] =
{
+ { "anonxero", "anonxero" ATSIGN "linuxmail" DOTSIGN "org", FALSE },
{ "Mehdi Esmaeelpour", "ariarat" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ehsan Akhlaghi", "esnka" ATSIGN "yahoo" DOTSIGN "com", FALSE },
{ NULL, NULL }
@@ -365,6 +371,7 @@ static const TranslatorInfo xfce_translators_ms[] =
static const TranslatorInfo xfce_translators_nb[] =
{
+ { "takoi", "thomas" DOTSIGN "amland" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Terje Uriansrud", "terje" ATSIGN "uriansrud" DOTSIGN "net", FALSE },
{ NULL, NULL }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update translators, week 51.
Updating branch refs/heads/xfce-4.8
to ab7402b85767278c2e18c11e920e43a65c65fc78 (commit)
from ec4725cd10fcbfe96aa8688c2c2e2eb6174345df (commit)
commit ab7402b85767278c2e18c11e920e43a65c65fc78
Author: Transifex
Date: Sun Dec 25 00:00:05 2011 +0100
Update translators, week 51.
xfce4-about/translators.h |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 9cf61e6..a90c747 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include
#include
-#define TRANSLATORS_H_STAMP "2011-12-18 00:00:05"
+#define TRANSLATORS_H_STAMP "2011-12-25 00:00:04"
#define ATSIGN "@"
#define DOTSIGN "."
@@ -166,6 +166,7 @@ static const TranslatorInfo xfce_translators_eo[] =
{
{ "Michael Moroni", "michael" DOTSIGN "moroni" ATSIGN "mailoo" DOTSIGN
"org", TRUE },
{ "Jakob Pedersen", "jakobp78" ATSIGN "gmail" DOTSIGN "com", FALSE },
+ { "Pierre Vittet", "pierre-vittet" ATSIGN "pvittet" DOTSIGN "com", FALSE },
{ "Aleksandr Ponomarenko", "davian818" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ NULL, NULL }
};
@@ -175,8 +176,10 @@ static const TranslatorInfo xfce_translators_es[] =
{ "Andres Sanchez", "afsanchez93" ATSIGN "gmail" DOTSIGN "com", TRUE },
{ "Abel Martín", "abel" DOTSIGN "martin" DOTSIGN "ruiz" ATSIGN "gmail"
DOTSIGN "com", TRUE },
{ "brunella capilongo broussard", "circe28" ATSIGN "libero" DOTSIGN "it",
FALSE },
+ { "Daniel Durante", "danieldurante" ATSIGN "ymail" DOTSIGN "com", FALSE },
{ "Javier Sánchez Reinosa", "donoban" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ignacio Velasco", "elega" ATSIGN "elega" DOTSIGN "com" DOTSIGN "ar",
FALSE },
+ { "el_sync", "elsyncmiami" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ernesto Chavez", "ernestoc33" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Esteban Vidal González", "esteban70x7" ATSIGN "yahoo" DOTSIGN "es", FALSE
},
{ "Adolfo Jayme Barrientos", "fitoschido" ATSIGN "gmail" DOTSIGN "com",
FALSE },
@@ -190,7 +193,9 @@ static const TranslatorInfo xfce_translators_es[] =
static const TranslatorInfo xfce_translators_es_AR[] =
{
{ "Diego Augusto Molina", "diegoaugustomolina" ATSIGN "gmail" DOTSIGN "com",
FALSE },
+ { "Manuel Fernando Aponte Guzmán", "manuelferchis" ATSIGN "gmail" DOTSIGN
"com", FALSE },
{ "Santiago Quiroga", "santiago" DOTSIGN "j" DOTSIGN "quiroga" ATSIGN
"gmail" DOTSIGN "com", FALSE },
+ { "C" DOTSIGN " Sebastian Biscussi", "sebastian" DOTSIGN "csb" ATSIGN
"gmail" DOTSIGN "com", FALSE },
{ "vtamara", "vtamara" ATSIGN "pasosdeJesus" DOTSIGN "org", FALSE },
{ NULL, NULL }
};
@@ -209,6 +214,7 @@ static const TranslatorInfo xfce_translators_eu[] =
static const TranslatorInfo xfce_translators_fa[] =
{
+ { "anonxero", "anonxero" ATSIGN "linuxmail" DOTSIGN "org", FALSE },
{ "Mehdi Esmaeelpour", "ariarat" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Ehsan Akhlaghi", "esnka" ATSIGN "yahoo" DOTSIGN "com", FALSE },
{ NULL, NULL }
@@ -365,6 +371,7 @@ static const TranslatorInfo xfce_translators_ms[] =
static const TranslatorInfo xfce_translators_nb[] =
{
+ { "takoi", "thomas" DOTSIGN "amland" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ "Terje Uriansrud", "terje" ATSIGN "uriansrud" DOTSIGN "net", FALSE },
{ NULL, NULL }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Arabic (ar) translation to 97%
Updating branch refs/heads/master to 85d9234307d41e295e12534328cae9cba1fc750d (commit) from 00d57801d07623e298653ba31d53d13a4f62213f (commit) commit 85d9234307d41e295e12534328cae9cba1fc750d Author: كريم أولاد الشلحة Date: Sat Dec 24 19:16:32 2011 +0100 l10n: Updated Arabic (ar) translation to 97% New status: 43 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 96 + 1 files changed, 52 insertions(+), 44 deletions(-) diff --git a/po/ar.po b/po/ar.po index 986b12b..82a45f6 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,155 +1,160 @@ +# msgid "" msgstr "" "Project-Id-Version: xfce\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-21 21:56+0100\n" +"POT-Creation-Date: 2011-12-24 12:39+\n" "PO-Revision-Date: 2008-07-15 17:33+0200\n" "Last-Translator: Mohamed Magdy \n" "Language-Team: Arabeyes \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Arabic\n" #: ../panel-plugin/devices.c:54 #, c-format msgid "%.1f B" -msgstr "" +msgstr "%.1f بايت" #: ../panel-plugin/devices.c:55 #, c-format msgid "%.1f KB" -msgstr "" +msgstr "%.1f كب" #: ../panel-plugin/devices.c:56 #, c-format msgid "%.1f MB" -msgstr "" +msgstr "%.1f مب" #: ../panel-plugin/devices.c:57 #, c-format msgid "%.1f GB" -msgstr "" +msgstr "%.1f جب" #: ../panel-plugin/devices.c:66 #, c-format msgid "size:%g\n" -msgstr "" +msgstr "حجم:%g\n" #: ../panel-plugin/devices.c:67 #, c-format msgid "used size: %g\n" -msgstr "" +msgstr "الحجم المستعمل: %g\n" #: ../panel-plugin/devices.c:68 #, c-format msgid "available siz: %g\n" -msgstr "" +msgstr "الحجم المتوفر: %g\n" #: ../panel-plugin/devices.c:69 #, c-format msgid "percentage used: %d\n" -msgstr "" +msgstr "نسبة المستعملة: %d\n" #: ../panel-plugin/devices.c:70 #, c-format msgid "file system type:%s\n" -msgstr "" +msgstr "نوع نظام الملفات:%s\n" #: ../panel-plugin/devices.c:71 #, c-format msgid "actual mount point: %s\n" -msgstr "" +msgstr "نقطة الضم الحالية: %s\n" #: ../panel-plugin/devices.c:155 #, c-format msgid "disk: %s\n" -msgstr "" +msgstr "قرص: %s\n" #: ../panel-plugin/devices.c:156 #, c-format msgid "mount point: %s\n" -msgstr "" +msgstr "نقطة الضم: %s\n" #: ../panel-plugin/devices.c:160 #, c-format msgid "not mounted\n" -msgstr "" +msgstr "غير موصل\n" -#: ../panel-plugin/devices.c:245 ../panel-plugin/devices.c:294 +#: ../panel-plugin/devices.c:260 ../panel-plugin/devices.c:309 msgid "Mount Plugin: Error executing command." -msgstr "" +msgstr "ملحق الضم: خطأ أتناء تنفيذ الأمر" #: ../panel-plugin/mount-plugin.c:57 #, c-format msgid "The device \"%s\" should be removable safely now." -msgstr "" +msgstr "يجب إزالة الجهاز \"%s\" بأمان الأن." #: ../panel-plugin/mount-plugin.c:60 #, c-format msgid "An error occurred. The device \"%s\" should not be removed!" -msgstr "" +msgstr "حدث خطأ. لا يجب إزالة الجهاز \"%s\"!" #: ../panel-plugin/mount-plugin.c:252 msgid "not mounted" -msgstr "" +msgstr "غير موصل" #: ../panel-plugin/mount-plugin.c:560 msgid "devices" -msgstr "" +msgstr "أجهزة" #: ../panel-plugin/mount-plugin.c:727 msgid "Mount Plugin" -msgstr "" +msgstr "ملحق الوصل" #: ../panel-plugin/mount-plugin.c:783 msgid "" "This is only useful and recommended if you specify \"sync\" as part of the " "\"unmount\" command string." -msgstr "" +msgstr "هذا يمكن إستعماله و موصى به فقط عندما تحدد \"sync\" كجزء من بنية الأمر \"unmount\"." #: ../panel-plugin/mount-plugin.c:788 msgid "Show _message after unmount" -msgstr "" +msgstr "عرض ر_سالة بعد إلغاء الضم" #: ../panel-plugin/mount-plugin.c:800 msgid "You can specify a distinct icon to be displayed in the panel." -msgstr "" +msgstr "يمكنك تحديد أيقونة ليتم إظهارها في الشريط." #: ../panel-plugin/mount-plugin.c:807 msgid "Icon:" -msgstr "" +msgstr "أيقونة:" #: ../panel-plugin/mount-plugin.c:811 msgid "Select an image" -msgstr "" +msgstr "حدد صورة" #: ../panel-plugin/mount-plugin.c:818 msgid "_General" -msgstr "" +msgstr "_عام" #: ../panel-plugin/mount-plugin.c:833 #, c-format msgid "" "This command will be executed after mounting the device with the mount point " "of the device as argument.\n" -"If you are unsure what to insert, try \"thunar %m\".\n" +"If you are unsure what to insert, try \"exo-open %m\".\n" "'%d' can be used to specify the device, '%m' for the mountpoint." msgstr "" +"هذا الامر سيتم تنفيذه بعد ضم الأجهزة مع نقطة الضم الحهاز.\n" +"إذا كنت غير متأكد من ماذا تريد إدخاله, جرب \"exo-open %m\".\n" +"'%d' يمكن إستعمالها لتحديد الجهاز, '%m' لنقطة الضم." #: ../panel-plugin/mount-plugin.c:843 msgid "_Execute after mounting:" -msgstr "" +msgstr "ت_شغيل بعد ضم:" #: ../panel-plugin/
[Xfce4-commits] Squashme: Continued work on DND reordering. We're getting somewhere.
Updating branch refs/heads/jannis/new-shortcuts-pane
to 7695d02ce8ab279163c23fb24e5d3d46493fae4e (commit)
from 64c8c4a5c3a85abe89368704e8c24f5206f30a92 (commit)
commit 7695d02ce8ab279163c23fb24e5d3d46493fae4e
Author: Jannis Pohlmann
Date: Sat Dec 24 16:50:49 2011 +0100
Squashme: Continued work on DND reordering. We're getting somewhere.
thunar/thunar-shortcut-group.c | 147 ++-
thunar/thunar-shortcut-group.h |5 ++
thunar/thunar-shortcut.c |2 -
3 files changed, 148 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c
index 8c55ac1..159a047 100644
--- a/thunar/thunar-shortcut-group.c
+++ b/thunar/thunar-shortcut-group.c
@@ -59,6 +59,9 @@ static void thunar_shortcut_group_set_property
(GObject
guint
prop_id,
const GValue
*value,
GParamSpec
*pspec);
+static void thunar_shortcut_group_drag_leave(GtkWidget
*widget,
+ GdkDragContext
*context,
+ guint
timestamp);
static gboolean thunar_shortcut_group_drag_motion (GtkWidget
*widget,
GdkDragContext
*context,
gint
x,
@@ -86,6 +89,8 @@ struct _ThunarShortcutGroup
ThunarShortcutType accepted_types;
GtkWidget *shortcuts;
+ GtkSizeGroup *size_group;
+ GtkWidget *empty_spot;
guint flash_idle_id;
guint flash_count;
@@ -121,6 +126,7 @@ thunar_shortcut_group_class_init (ThunarShortcutGroupClass
*klass)
gobject_class->set_property = thunar_shortcut_group_set_property;
gtkwidget_class = GTK_WIDGET_CLASS (klass);
+ gtkwidget_class->drag_leave = thunar_shortcut_group_drag_leave;
gtkwidget_class->drag_motion = thunar_shortcut_group_drag_motion;
g_object_class_install_property (gobject_class,
@@ -170,11 +176,21 @@ thunar_shortcut_group_constructed (GObject *object)
{
ThunarShortcutGroup *group = THUNAR_SHORTCUT_GROUP (object);
+ /* configure the look and feel of the expander */
gtk_expander_set_use_markup (GTK_EXPANDER (group), TRUE);
/* TODO make this depend on the last remembered state: */
gtk_expander_set_expanded (GTK_EXPANDER (group), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (group), 0);
gtk_expander_set_spacing (GTK_EXPANDER (group), 0);
+
+ /* create a size group to enforce the same size for all shortcuts */
+ group->size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
+
+ /* create an empty label to indicate an empty spot when re-ordering
+ * shortcuts via DND */
+ group->empty_spot = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (group->empty_spot), GTK_SHADOW_IN);
+ g_object_ref (group->empty_spot);
}
@@ -200,6 +216,12 @@ thunar_shortcut_group_finalize (GObject *object)
if (group->flash_idle_id > 0)
g_source_remove (group->flash_idle_id);
+ /* release the empty spot label */
+ g_object_unref (group->empty_spot);
+
+ /* release the size group */
+ g_object_unref (group->size_group);
+
(*G_OBJECT_CLASS (thunar_shortcut_group_parent_class)->finalize) (object);
}
@@ -261,6 +283,27 @@ thunar_shortcut_group_set_property (GObject *object,
+static void
+thunar_shortcut_group_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint timestamp)
+{
+ ThunarShortcutGroup *group = THUNAR_SHORTCUT_GROUP (widget);
+
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUT_GROUP (widget));
+ _thunar_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
+
+ /* TODO immediately make the drag source visible again */
+
+ gtk_container_remove (GTK_CONTAINER (group->shortcuts), group->empty_spot);
+
+ /* call the parent's drag_leave() handler */
+ if (GTK_WIDGET_CLASS (thunar_shortcut_group_parent_class)->drag_leave !=
NULL)
+(*GTK_WIDGET_CLASS (thunar_shortcut_group_parent_class)->drag_leave)
(widget, context, timestamp);
+}
+
+
+
static gboolean
thunar_shortcut_group_drag_motion (GtkWidget *widget,
GdkDragContext *context,
@@ -268,16 +311,59 @@ thunar_shortcut_group_drag_motion (GtkWidget *widget,
ginty,
guint timestamp)
{
-#if 0
ThunarShortcutGroup *group = THUNAR_SHORTCUT_GROUP (widget);
-#endif
+ ThunarShortcut *shortcut;
+ GtkAllocationallocation;
+ GdkAtom target;
+ gint
[Xfce4-commits] Use GtkExpander as ThunarShortcutsGroup.
Updating branch refs/heads/jannis/new-shortcuts-pane
to 64c8c4a5c3a85abe89368704e8c24f5206f30a92 (commit)
from 37fefbcce950246d7277d82c0df8d91ebb15e326 (commit)
commit 64c8c4a5c3a85abe89368704e8c24f5206f30a92
Author: Nick Schermer
Date: Sat Dec 24 13:57:46 2011 +0100
Use GtkExpander as ThunarShortcutsGroup.
This will property handle the dnd motion event and make it
a bit simpler too.
thunar/thunar-shortcut-group.c | 39 ---
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c
index 4c16439..8c55ac1 100644
--- a/thunar/thunar-shortcut-group.c
+++ b/thunar/thunar-shortcut-group.c
@@ -76,16 +76,15 @@ static void thunar_shortcut_group_apply_indentation
(ThunarShortcutGroup
struct _ThunarShortcutGroupClass
{
- GtkEventBoxClass __parent__;
+ GtkExpanderClass __parent__;
};
struct _ThunarShortcutGroup
{
- GtkEventBox__parent__;
+ GtkExpander__parent__;
ThunarShortcutType accepted_types;
- GtkWidget *expander;
GtkWidget *shortcuts;
guint flash_idle_id;
@@ -94,7 +93,7 @@ struct _ThunarShortcutGroup
-G_DEFINE_TYPE (ThunarShortcutGroup, thunar_shortcut_group, GTK_TYPE_EVENT_BOX)
+G_DEFINE_TYPE (ThunarShortcutGroup, thunar_shortcut_group, GTK_TYPE_EXPANDER)
@@ -149,23 +148,13 @@ thunar_shortcut_group_class_init
(ThunarShortcutGroupClass *klass)
static void
thunar_shortcut_group_init (ThunarShortcutGroup *group)
{
- /* create the expander for this group */
- group->expander = gtk_expander_new (NULL);
- gtk_expander_set_use_markup (GTK_EXPANDER (group->expander), TRUE);
- /* TODO make this depend on the last remembered state: */
- gtk_expander_set_expanded (GTK_EXPANDER (group->expander), TRUE);
- gtk_container_set_border_width (GTK_CONTAINER (group->expander), 0);
- gtk_expander_set_spacing (GTK_EXPANDER (group->expander), 0);
- gtk_container_add (GTK_CONTAINER (group), group->expander);
- gtk_widget_show (group->expander);
-
- g_signal_connect_swapped (group->expander, "style-set",
+ g_signal_connect_swapped (group, "style-set",
G_CALLBACK
(thunar_shortcut_group_expand_style_set),
group);
/* add a box for the individual shortcuts */
group->shortcuts = gtk_vbox_new (TRUE, 0);
- gtk_container_add (GTK_CONTAINER (group->expander), group->shortcuts);
+ gtk_container_add (GTK_CONTAINER (group), group->shortcuts);
gtk_widget_show (group->shortcuts);
/* set the group up as a drop site to allow shortcuts to be re-ordered by
DND */
@@ -179,9 +168,13 @@ thunar_shortcut_group_init (ThunarShortcutGroup *group)
static void
thunar_shortcut_group_constructed (GObject *object)
{
-#if 0
ThunarShortcutGroup *group = THUNAR_SHORTCUT_GROUP (object);
-#endif
+
+ gtk_expander_set_use_markup (GTK_EXPANDER (group), TRUE);
+ /* TODO make this depend on the last remembered state: */
+ gtk_expander_set_expanded (GTK_EXPANDER (group), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (group), 0);
+ gtk_expander_set_spacing (GTK_EXPANDER (group), 0);
}
@@ -224,7 +217,7 @@ thunar_shortcut_group_get_property (GObject*object,
switch (prop_id)
{
case PROP_LABEL:
- label = gtk_expander_get_label (GTK_EXPANDER (group->expander));
+ label = gtk_expander_get_label (GTK_EXPANDER (group));
g_value_set_string (value, label);
break;
case PROP_ACCCEPTED_TYPES:
@@ -254,7 +247,7 @@ thunar_shortcut_group_set_property (GObject *object,
case PROP_LABEL:
label = g_value_get_string (value);
label_markup = g_markup_printf_escaped (markup_format, label);
- gtk_expander_set_label (GTK_EXPANDER (group->expander), label_markup);
+ gtk_expander_set_label (GTK_EXPANDER (group), label_markup);
g_free (label_markup);
break;
case PROP_ACCCEPTED_TYPES:
@@ -295,7 +288,7 @@ thunar_shortcut_group_attract_attention
(ThunarShortcutGroup *group)
_thunar_return_if_fail (THUNAR_IS_SHORTCUT_GROUP (group));
/* check if we are in collapsed mode */
- if (!gtk_expander_get_expanded (GTK_EXPANDER (group->expander)))
+ if (!gtk_expander_get_expanded (GTK_EXPANDER (group)))
{
/* abort active flash idle handlers */
if (group->flash_idle_id > 0)
@@ -370,7 +363,7 @@ thunar_shortcut_group_expand_style_set (ThunarShortcutGroup
*group,
_thunar_return_if_fail (THUNAR_IS_SHORTCUT_GROUP (group));
_thunar_return_if_fail (GTK_IS_EXPANDER (expander));
- _thunar_return_if_fail (expander == group->expander);
+ _thunar_return_if_fail (expander == GTK_WIDGET (group));
children = gtk_container_get_children (GTK_CONTAINER (group->shortcuts));
@@ -394,7 +387,7 @@ thunar_shortcut_group_apply_indentation
(ThunarShortcutGroup *group,
_thunar_return_if_fail (THUNAR_IS_SHORTCUT (shortcut));
/* get information
[Xfce4-commits] Use realtime POSIX timers for the clock.
Updating branch refs/heads/nick/clockrealtime
to 7d8d7f370d6c2a9f0f6a8ead0a60f43971cc28a3 (commit)
from d6b3f4b0f6dfe4870b764fe48423c50a28ef4f97 (commit)
commit 7d8d7f370d6c2a9f0f6a8ead0a60f43971cc28a3
Author: Nick Schermer
Date: Sat Dec 3 18:13:20 2011 +0100
Use realtime POSIX timers for the clock.
Use timer functions that work properly after
suspending the system.
plugins/clock/clock.c | 151 +++-
1 files changed, 60 insertions(+), 91 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 77a1d1c..135b45a 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -23,6 +23,9 @@
#ifdef HAVE_TIME_H
#include
#endif
+#ifdef HAVE_SIGNAL_H
+#include
+#endif
#ifdef HAVE_MATH_H
#include
#endif
@@ -71,9 +74,6 @@ static void clock_plugin_orientation_changed
(XfcePanelPlugin *p
static void clock_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
static void clock_plugin_set_mode (ClockPlugin
*plugin);
static gboolean clock_plugin_tooltip (gpointer
user_data);
-static gboolean clock_plugin_timeout_running (gpointer
user_data);
-static void clock_plugin_timeout_destroyed (gpointer
user_data);
-static gboolean clock_plugin_timeout_sync (gpointer
user_data);
@@ -125,11 +125,11 @@ struct _ClockPlugin
struct _ClockPluginTimeout
{
- guint interval;
GSourceFunc function;
gpointerdata;
- guint timeout_id;
- guint restart : 1;
+ guint interval;
+ guint timer_idle;
+ timer_t timer_id;
};
typedef struct
@@ -887,62 +887,35 @@ clock_plugin_tooltip (gpointer user_data)
static gboolean
-clock_plugin_timeout_running (gpointer user_data)
+clock_plugin_timeout_expired_idle (gpointer data)
{
- ClockPluginTimeout *timeout = user_data;
- gbooleanresult;
- struct tm tm;
+ ClockPluginTimeout *timeout = data;
+
+ timeout->timer_idle = 0;
GDK_THREADS_ENTER ();
- result = (timeout->function) (timeout->data);
+ (timeout->function) (timeout->data);
GDK_THREADS_LEAVE ();
- /* check if the timeout still runs in time if updating once a minute */
- if (result && timeout->interval == CLOCK_INTERVAL_MINUTE)
-{
- /* sync again when we don't run on time */
- clock_plugin_get_localtime (&tm);
- timeout->restart = tm.tm_sec != 0;
-}
-
- return result && !timeout->restart;
+ return FALSE;
}
static void
-clock_plugin_timeout_destroyed (gpointer user_data)
+clock_plugin_timeout_expired (sigval_t info)
{
- ClockPluginTimeout *timeout = user_data;
-
- timeout->timeout_id = 0;
-
- if (G_UNLIKELY (timeout->restart))
-clock_plugin_timeout_set_interval (timeout, timeout->interval);
-}
-
+ ClockPluginTimeout *timeout = info.sival_ptr;
+ panel_return_if_fail (GTK_IS_WIDGET (timeout->data));
-static gboolean
-clock_plugin_timeout_sync (gpointer user_data)
-{
- ClockPluginTimeout *timeout = user_data;
+ /* drop pending timeout */
+ if (timeout->timer_idle != 0)
+g_source_remove (timeout->timer_idle);
- /* run the user function */
- if ((timeout->function) (timeout->data))
-{
- /* start the real timeout */
- timeout->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
timeout->interval,
-
clock_plugin_timeout_running, timeout,
-
clock_plugin_timeout_destroyed);
-}
- else
-{
- timeout->timeout_id = 0;
-}
-
- /* stop the sync timeout */
- return FALSE;
+ /* this function is called in a new thread, schedule
+ * an update in the mainloop */
+ timeout->timer_idle = g_idle_add (clock_plugin_timeout_expired_idle,
timeout);
}
@@ -953,18 +926,25 @@ clock_plugin_timeout_new (guint interval,
gpointerdata)
{
ClockPluginTimeout *timeout;
+ struct sigevent event;
panel_return_val_if_fail (interval > 0, NULL);
panel_return_val_if_fail (function != NULL, NULL);
timeout = g_slice_new0 (ClockPluginTimeout);
- timeout->interval = 0;
timeout->function = function;
timeout->data = data;
- timeout->timeout_id = 0;
- timeout->restart = FALSE;
- clock_plugin_timeout_set_interval (timeout, interval);
+ event.sigev_notify = SIGEV_THREAD;
+ event.sigev_notify_function = clock_plugin_timeout_expired;
+ event.sigev_notify_attributes = NULL;
+ event.sigev_value.sival_ptr = timeout;
+
+ /* create the realtime timer */
+ if (timer_create (CLOCK_REALTIME, &event, &timeout->timer_id) == 0)
+clock_plugin_timeout_set_interval (timeout, interval);
+ else
+g_critical ("Failed to start realtime clock timeout");
return timeout;
}
@@ -975,53 +955,42 @@ void
clock_plugin_timeout_
[Xfce4-commits] Creating branch nick/clockrealtime
Updating branch refs/heads/nick/clockrealtime as new branch to 7d8d7f370d6c2a9f0f6a8ead0a60f43971cc28a3 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/clockrealtime 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] Deleting branch nick/desktop-mode
Deleting branch refs/heads/nick/desktop-mode ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tasklist: Add support for deskbar mode and use nrows.
Updating branch refs/heads/master
to 534a173474851f440879d7dd24e207ddd96b4317 (commit)
from 3fcff86791a2324be77000520e720f7d0e3b2732 (commit)
commit 534a173474851f440879d7dd24e207ddd96b4317
Author: Andrzej
Date: Tue Dec 13 19:49:39 2011 +0100
Tasklist: Add support for deskbar mode and use nrows.
plugins/tasklist/tasklist-dialog.glade | 15 +---
plugins/tasklist/tasklist-widget.c | 195
plugins/tasklist/tasklist-widget.h |7 +-
plugins/tasklist/tasklist.c| 31 --
4 files changed, 123 insertions(+), 125 deletions(-)
diff --git a/plugins/tasklist/tasklist-dialog.glade
b/plugins/tasklist/tasklist-dialog.glade
index 21e24cc..db6db74 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.glade
@@ -73,19 +73,6 @@
-
-Ro_tate
buttons in vertical panel
-True
-True
-False
-True
-True
-
-
-3
-
-
-
True
12
@@ -119,7 +106,7 @@
-4
+3
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index d5ad920..e5edd1b 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -68,7 +68,9 @@
#define xfce_taskbar_is_locked(tasklist) (XFCE_TASKLIST (tasklist)->locked > 0)
#define xfce_tasklist_get_panel_plugin(tasklist) gtk_widget_get_ancestor
(GTK_WIDGET (tasklist), XFCE_TYPE_PANEL_PLUGIN)
-#define xfce_tasklist_horizontal(tasklist) ((tasklist)->horizontal ||
(!(tasklist)->rotate_vertically && (tasklist)->show_labels))
+#define xfce_tasklist_horizontal(tasklist) ((tasklist)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+#define xfce_tasklist_vertical(tasklist) ((tasklist)->mode ==
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
+#define xfce_tasklist_deskbar(tasklist) ((tasklist)->mode ==
XFCE_PANEL_PLUGIN_MODE_DESKBAR)
#define xfce_tasklist_filter_monitors(tasklist) (!(tasklist)->all_monitors &&
(tasklist)->monitor_geometry.width != -1)
#define xfce_tasklist_geometry_set_invalid(tasklist)
((tasklist)->monitor_geometry.width = -1)
#define xfce_tasklist_geometry_has_point(tasklist, x, y) ( \
@@ -92,7 +94,6 @@ enum
PROP_SHOW_WIREFRAMES,
PROP_SHOW_HANDLE,
PROP_SORT_ORDER,
- PROP_ROTATE_VERTICALLY,
PROP_WINDOW_SCROLLING
};
@@ -130,8 +131,8 @@ struct _XfceTasklist
/* size of the panel pluin */
gint size;
- /* orientation of the tasklist */
- guint horizontal : 1;
+ /* mode (orientation) of the tasklist */
+ XfcePanelPluginMode mode;
/* relief of the tasklist buttons */
GtkReliefStylebutton_relief;
@@ -148,8 +149,8 @@ struct _XfceTasklist
* tasklist */
guint only_minimized : 1;
- /* if we rotate buttons in a vertical panel */
- guint rotate_vertically : 1;
+ /* number of rows of window buttons */
+ gint nrows;
/* switch window with the mouse wheel */
guint window_scrolling : 1;
@@ -342,9 +343,6 @@ static void xfce_tasklist_set_show_wireframes
(XfceTa
gboolean show_wireframes);
static void xfce_tasklist_set_grouping
(XfceTasklist *tasklist,
XfceTasklistGrouping grouping);
-static void xfce_tasklist_set_rotate_vertically
(XfceTasklist *tasklist,
-
gboolean rotate_vertically);
-
G_DEFINE_TYPE (XfceTasklist, xfce_tasklist, GTK_TYPE_CONTAINER)
@@ -456,13 +454,6 @@ xfce_tasklist_class_init (XfceTasklistClass *klass)
EXO_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_ROTATE_VERTICALLY,
- g_param_spec_boolean ("rotate-vertically",
- NULL, NULL,
- TRUE,
- EXO_PARAM_READWRITE));
-
- g_object_class_ins
[Xfce4-commits] Actions: Make the plugin work in deskbar mode.
Updating branch refs/heads/master
to eff7fbf13fd5dd65eaa4fb5bb7a48a77f40ae10b (commit)
from f622d4e61f0a681b1a9968659ef57a436c70d921 (commit)
commit eff7fbf13fd5dd65eaa4fb5bb7a48a77f40ae10b
Author: Nick Schermer
Date: Mon Dec 12 23:42:51 2011 +0900
Actions: Make the plugin work in deskbar mode.
plugins/actions/actions.c | 40 +---
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 3fafb3e..a3414e2 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -55,8 +55,8 @@ static void actions_plugin_free_data
(XfcePanelPlugin *pan
static gboolean actions_plugin_size_changed(XfcePanelPlugin
*panel_plugin,
gint
size);
static void actions_plugin_configure_plugin(XfcePanelPlugin
*panel_plugin);
-static void actions_plugin_orientation_changed (XfcePanelPlugin
*panel_plugin,
- GtkOrientation
orientation);
+static void actions_plugin_mode_changed(XfcePanelPlugin
*panel_plugin,
+ XfcePanelPluginMode
mode);
static void actions_plugin_pack(ActionsPlugin
*plugin);
static GPtrArray *actions_plugin_default_array (void);
static void actions_plugin_menu(GtkWidget
*button,
@@ -237,7 +237,7 @@ actions_plugin_class_init (ActionsPluginClass *klass)
plugin_class->free_data = actions_plugin_free_data;
plugin_class->size_changed = actions_plugin_size_changed;
plugin_class->configure_plugin = actions_plugin_configure_plugin;
- plugin_class->orientation_changed = actions_plugin_orientation_changed;
+ plugin_class->mode_changed = actions_plugin_mode_changed;
g_object_class_install_property (gobject_class,
PROP_ITEMS,
@@ -387,8 +387,8 @@ actions_plugin_construct (XfcePanelPlugin *panel_plugin)
actions_plugin_pack (plugin);
/* set orientation and size */
- actions_plugin_orientation_changed (panel_plugin,
- xfce_panel_plugin_get_orientation (panel_plugin));
+ actions_plugin_mode_changed (panel_plugin,
+ xfce_panel_plugin_get_mode (panel_plugin));
}
@@ -681,8 +681,8 @@ actions_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
static void
-actions_plugin_orientation_changed (XfcePanelPlugin *panel_plugin,
-GtkOrientation orientation)
+actions_plugin_mode_changed (XfcePanelPlugin *panel_plugin,
+ XfcePanelPluginMode mode)
{
actions_plugin_pack (XFCE_ACTIONS_PLUGIN (panel_plugin));
}
@@ -958,17 +958,18 @@ actions_plugin_action_menu_item (ActionsPlugin *plugin,
static gboolean
actions_plugin_pack_idle (gpointer data)
{
- ActionsPlugin *plugin = XFCE_ACTIONS_PLUGIN (data);
- GtkWidget *label;
- GtkWidget *button;
- GtkWidget *widget;
- const gchar*username;
- GtkWidget *child;
- GtkWidget *box;
- guint i;
- const GValue *val;
- ginttype;
- GtkOrientation orientation;
+ ActionsPlugin *plugin = XFCE_ACTIONS_PLUGIN (data);
+ GtkWidget *label;
+ GtkWidget *button;
+ GtkWidget *widget;
+ const gchar *username;
+ GtkWidget *child;
+ GtkWidget *box;
+ guinti;
+ const GValue*val;
+ gint type;
+ GtkOrientation orientation;
+ XfcePanelPluginMode mode;
child = gtk_bin_get_child (GTK_BIN (plugin));
if (child != NULL)
@@ -1038,8 +1039,9 @@ actions_plugin_pack_idle (gpointer data)
label = gtk_label_new (username);
gtk_container_add (GTK_CONTAINER (button), label);
+ mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
gtk_label_set_angle (GTK_LABEL (label),
- orientation == GTK_ORIENTATION_HORIZONTAL ? 0 : 270);
+ (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? 270 : 0);
gtk_widget_show (label);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tasklist: Remove the max-button-size style property.
Updating branch refs/heads/master
to f622d4e61f0a681b1a9968659ef57a436c70d921 (commit)
from 534a173474851f440879d7dd24e207ddd96b4317 (commit)
commit f622d4e61f0a681b1a9968659ef57a436c70d921
Author: Nick Schermer
Date: Tue Dec 13 19:51:48 2011 +0100
Tasklist: Remove the max-button-size style property.
This is not used anymore, the tasklist adopts the nrows
setting of the panel.
docs/README.gtkrc-2.0 |5 -
plugins/tasklist/tasklist-widget.c | 18 --
2 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/docs/README.gtkrc-2.0 b/docs/README.gtkrc-2.0
index 17d7276..01716e3 100644
--- a/docs/README.gtkrc-2.0
+++ b/docs/README.gtkrc-2.0
@@ -50,11 +50,6 @@ style "xfce-tasklist-style"
# entire available space.
XfceTasklist::max-button-length = 200
- # Maximum size of a button. This is used to detect the number of
- # rows of the task list plugin. When you increase the value less
- # rows will be possible.
- XfceTasklist::max-button-size = 20
-
# Ellipsizing used in the task list and overflow menu labels.
XfceTasklist::ellipsize-mode = PANGO_ELLIPSIZE_END
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index e5edd1b..8172d01 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -44,7 +44,6 @@
-#define DEFAULT_BUTTON_SIZE (25)
#define DEFAULT_MAX_BUTTON_LENGTH(200)
#define DEFAULT_MENU_ICON_SIZE (16)
#define DEFAULT_MIN_BUTTON_LENGTH(DEFAULT_MAX_BUTTON_LENGTH / 4)
@@ -187,7 +186,6 @@ struct _XfceTasklist
/* gtk style properties */
gint max_button_length;
gint min_button_length;
- gint max_button_size;
PangoEllipsizeModeellipsize_mode;
gint minimized_icon_lucency;
gint menu_icon_size;
@@ -477,14 +475,6 @@ xfce_tasklist_class_init (XfceTasklistClass *klass)
EXO_PARAM_READABLE));
gtk_widget_class_install_style_property (gtkwidget_class,
- g_param_spec_int ("max-button-size",
- NULL,
- "The maximum size
of a window button",
- 1, G_MAXINT,
-
DEFAULT_BUTTON_SIZE,
-
EXO_PARAM_READABLE));
-
- gtk_widget_class_install_style_property (gtkwidget_class,
g_param_spec_enum ("ellipsize-mode",
NULL,
"The ellipsize
mode used for the button label",
@@ -544,7 +534,6 @@ xfce_tasklist_init (XfceTasklist *tasklist)
tasklist->update_monitor_geometry_id = 0;
tasklist->max_button_length = DEFAULT_MAX_BUTTON_LENGTH;
tasklist->min_button_length = DEFAULT_MIN_BUTTON_LENGTH;
- tasklist->max_button_size = DEFAULT_BUTTON_SIZE;
tasklist->minimized_icon_lucency = DEFAULT_ICON_LUCENCY;
tasklist->ellipsize_mode = DEFAULT_ELLIPSIZE_MODE;
tasklist->grouping = XFCE_TASKLIST_GROUPING_DEFAULT;
@@ -839,10 +828,8 @@ xfce_tasklist_size_layout (XfceTasklist *tasklist,
/* if we're in deskbar mode, there are no columns */
if (xfce_tasklist_deskbar (tasklist) && tasklist->show_labels)
-//rows = tasklist->n_windows;
rows = 1;
else
-/* rows = alloc->height / tasklist->max_button_size; */
rows = tasklist->nrows;
if (rows < 1)
@@ -1103,7 +1090,6 @@ xfce_tasklist_style_set (GtkWidget *widget,
{
XfceTasklist *tasklist = XFCE_TASKLIST (widget);
gint max_button_length;
- gint max_button_size;
gint min_button_length;
gint w, h;
@@ -1115,7 +1101,6 @@ xfce_tasklist_style_set (GtkWidget *widget,
"max-button-length", &max_button_length,
"min-button-length", &min_button_length,
"ellipsize-mode", &tasklist->ellipsize_mode,
-"max-button-size", &max_button_size,
"minimized-icon-lucency",
&tasklist->minimized_icon_lucency,
"menu-max-width-chars",
&tasklist->menu_max_width_chars,
NULL);
@@ -1125,7 +1110,6 @@ xfce_tasklist_style_set (GtkWidget *widget,
/* update the widget */
if (tasklist->max_button_length != max_button_length
- || tasklist->max_button_size != max_button_size
|| tasklist->min_button_length != min_button_length)
{
if (max_button_length > 0)
@@ -1140,8 +1124,6 @@ xfce_tasklist_style_set (GtkWidget *widget,
tasklist->min_button_length = min_button_length;
[Xfce4-commits] Launcher: Changing label orientation in a vertical mode.
Updating branch refs/heads/master
to 3fcff86791a2324be77000520e720f7d0e3b2732 (commit)
from 644b407a34265845b8ea35f18a3a71c561e81627 (commit)
commit 3fcff86791a2324be77000520e720f7d0e3b2732
Author: Andrzej
Date: Tue Dec 13 14:34:34 2011 +0900
Launcher: Changing label orientation in a vertical mode.
(cherry picked from commit 3fb6dbf32f8b7c708f3515a1ebc968adb70635e1)
plugins/launcher/launcher.c | 21 ++---
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 82d1daa..d68d21a 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -66,8 +66,8 @@ static gboolean launcher_plugin_remote_event
(XfcePan
const
GValue *value);
static gboolean launcher_plugin_save_delayed_timeout
(gpointer user_data);
static void launcher_plugin_save_delayed
(LauncherPlugin *plugin);
-static void launcher_plugin_orientation_changed
(XfcePanelPlugin *panel_plugin,
-
GtkOrientationorientation);
+static void launcher_plugin_mode_changed
(XfcePanelPlugin *panel_plugin,
+
XfcePanelPluginMode mode);
static gboolean launcher_plugin_size_changed
(XfcePanelPlugin *panel_plugin,
gint
size);
static void launcher_plugin_configure_plugin
(XfcePanelPlugin *panel_plugin);
@@ -268,7 +268,7 @@ launcher_plugin_class_init (LauncherPluginClass *klass)
plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
plugin_class->construct = launcher_plugin_construct;
plugin_class->free_data = launcher_plugin_free_data;
- plugin_class->orientation_changed = launcher_plugin_orientation_changed;
+ plugin_class->mode_changed = launcher_plugin_mode_changed;
plugin_class->size_changed = launcher_plugin_size_changed;
plugin_class->configure_plugin = launcher_plugin_configure_plugin;
plugin_class->screen_position_changed =
launcher_plugin_screen_position_changed;
@@ -1211,9 +1211,12 @@ launcher_plugin_save_delayed (LauncherPlugin *plugin)
static void
-launcher_plugin_orientation_changed (XfcePanelPlugin *panel_plugin,
- GtkOrientation orientation)
+launcher_plugin_mode_changed (XfcePanelPlugin*panel_plugin,
+ XfcePanelPluginMode mode)
{
+ /* update label orientation */
+ launcher_plugin_button_update (XFCE_LAUNCHER_PLUGIN (panel_plugin));
+
/* update the widget order */
launcher_plugin_pack_widgets (XFCE_LAUNCHER_PLUGIN (panel_plugin));
@@ -1689,8 +1692,9 @@ launcher_plugin_menu_destroy (LauncherPlugin *plugin)
static void
launcher_plugin_button_update (LauncherPlugin *plugin)
{
- GarconMenuItem *item = NULL;
- const gchar*icon_name;
+ GarconMenuItem *item = NULL;
+ const gchar *icon_name;
+ XfcePanelPluginMode mode;
panel_return_if_fail (XFCE_IS_LAUNCHER_PLUGIN (plugin));
@@ -1708,6 +1712,9 @@ launcher_plugin_button_update (LauncherPlugin *plugin)
if (G_UNLIKELY (plugin->show_label))
{
panel_return_if_fail (GTK_IS_LABEL (plugin->child));
+ mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
+ gtk_label_set_angle (GTK_LABEL (plugin->child),
+ (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? 270 :
0);
gtk_label_set_text (GTK_LABEL (plugin->child),
item != NULL ? garcon_menu_item_get_name (item) : _("No items"));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Update authors.
Updating branch refs/heads/master
to 644b407a34265845b8ea35f18a3a71c561e81627 (commit)
from 9a10190ffbe3d219648c0ed47472dee33d47766e (commit)
commit 644b407a34265845b8ea35f18a3a71c561e81627
Author: Nick Schermer
Date: Tue Dec 13 18:49:13 2011 +0100
Panel: Update authors.
panel/panel-dialogs.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/panel/panel-dialogs.c b/panel/panel-dialogs.c
index eb9c4ac..d7fd918 100644
--- a/panel/panel-dialogs.c
+++ b/panel/panel-dialogs.c
@@ -60,8 +60,9 @@ panel_dialogs_show_about (void)
{
static const gchar *authors[] =
{
-"Jasper Huijsmans ",
-"Nick Schermer ",
+"Maintainer:\nNick Schermer \n",
+"Deskbar Mode:\nAndrzej Radecki \n",
+"Inactive Maintainers:\nJasper Huijsmans ",
"Tic-tac-toe ",
NULL
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Launcher: Set the small property.
Updating branch refs/heads/master to 9a10190ffbe3d219648c0ed47472dee33d47766e (commit) from d4210bb2a179f8178ca0c4e6862c86a207ee7586 (commit) commit 9a10190ffbe3d219648c0ed47472dee33d47766e Author: Nick Schermer Date: Mon Dec 12 20:28:59 2011 +0100 Launcher: Set the small property. plugins/launcher/launcher.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c index b2354a3..82d1daa 100644 --- a/plugins/launcher/launcher.c +++ b/plugins/launcher/launcher.c @@ -1002,7 +1002,9 @@ launcher_plugin_construct (XfcePanelPlugin *panel_plugin) }; /* show the configure menu item */ - xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin)); + xfce_panel_plugin_menu_show_configure (panel_plugin); + + xfce_panel_plugin_set_small (panel_plugin, TRUE); /* lookup the config directory where this launcher stores it's desktop files */ file = g_strdup_printf (RELATIVE_CONFIG_PATH, @@ -1237,6 +1239,7 @@ launcher_plugin_size_changed (XfcePanelPlugin *panel_plugin, LauncherArrowType arrow_position; /* initialize the plugin size */ + size /= xfce_panel_plugin_get_nrows (panel_plugin); p_width = p_height = size; a_width = a_height = -1; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Libxfce4panel: Add missing constant in property access.
Updating branch refs/heads/master to 66faf4adb5817b06fa25dd213bcddaddf09d4198 (commit) from d8ff795beb64febb59d7952f05a3f9d68aabfbda (commit) commit 66faf4adb5817b06fa25dd213bcddaddf09d4198 Author: Andrzej Date: Mon Dec 12 23:12:03 2011 +0900 Libxfce4panel: Add missing constant in property access. (cherry picked from commit 10c5fc4ef7a8ae553b4eaad8dc87499d3244d949) libxfce4panel/xfce-panel-plugin.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c index a27d23f..34a3b5a 100644 --- a/libxfce4panel/xfce-panel-plugin.c +++ b/libxfce4panel/xfce-panel-plugin.c @@ -806,6 +806,10 @@ xfce_panel_plugin_get_property (GObject*object, g_value_set_uint (value, private->nrows); break; +case PROP_MODE: + g_value_set_enum (value, private->mode); + break; + case PROP_SMALL: g_value_set_boolean (value, private->small); break; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Libxfce4panel: Fix size-changed signal/prop emit.
Updating branch refs/heads/master
to d4210bb2a179f8178ca0c4e6862c86a207ee7586 (commit)
from 66faf4adb5817b06fa25dd213bcddaddf09d4198 (commit)
commit d4210bb2a179f8178ca0c4e6862c86a207ee7586
Author: Nick Schermer
Date: Mon Dec 12 19:58:29 2011 +0100
Libxfce4panel: Fix size-changed signal/prop emit.
libxfce4panel/xfce-panel-plugin.c | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index 34a3b5a..80adb0f 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1360,12 +1360,14 @@ xfce_panel_plugin_set_size (XfcePanelPluginProvider
*provider,
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (provider));
- real_size = size * plugin->priv->nrows;
-
- /* check if update is required */
- if (G_LIKELY (plugin->priv->size != real_size))
+ /* check if update is required, -1 for forced property emit
+ * by xfce_panel_plugin_set_nrows */
+ if (G_LIKELY (plugin->priv->size != size))
{
- plugin->priv->size = size;
+ if (size != -1)
+plugin->priv->size = size;
+
+ real_size = plugin->priv->size * plugin->priv->nrows;
g_signal_emit (G_OBJECT (plugin),
plugin_signals[SIZE_CHANGED], 0, real_size, &handled);
@@ -1437,7 +1439,7 @@ xfce_panel_plugin_set_nrows (XfcePanelPluginProvider
*provider,
g_object_notify (G_OBJECT (plugin), "nrows");
/* also the size changed */
- xfce_panel_plugin_set_size (provider, plugin->priv->size);
+ xfce_panel_plugin_set_size (provider, -1);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Applicationmenu: Properly allocate the menu button in all modes.
Updating branch refs/heads/master
to cc701714aa73dc841c4f9056f9bc22a24e9b2930 (commit)
from cefedfe485fa9308a4de66be65d9a723f4c8213b (commit)
commit cc701714aa73dc841c4f9056f9bc22a24e9b2930
Author: Andrzej
Date: Mon Dec 12 19:52:37 2011 +0100
Applicationmenu: Properly allocate the menu button in all modes.
plugins/applicationsmenu/applicationsmenu.c | 60 +++
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/plugins/applicationsmenu/applicationsmenu.c
b/plugins/applicationsmenu/applicationsmenu.c
index 5b2045d..0193f8d 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -101,8 +101,8 @@ static void applications_menu_plugin_construct
(XfcePanelPlugin
static void applications_menu_plugin_free_data
(XfcePanelPlugin*panel_plugin);
static gboolean applications_menu_plugin_size_changed
(XfcePanelPlugin*panel_plugin,
gint
size);
-static void applications_menu_plugin_orientation_changed
(XfcePanelPlugin*panel_plugin,
-GtkOrientation
orientation);
+static void applications_menu_plugin_mode_changed
(XfcePanelPlugin*panel_plugin,
+
XfcePanelPluginMode mode);
static void applications_menu_plugin_configure_plugin
(XfcePanelPlugin*panel_plugin);
static gboolean applications_menu_plugin_remote_event
(XfcePanelPlugin*panel_plugin,
const gchar
*name,
@@ -137,7 +137,7 @@ applications_menu_plugin_class_init
(ApplicationsMenuPluginClass *klass)
plugin_class->construct = applications_menu_plugin_construct;
plugin_class->free_data = applications_menu_plugin_free_data;
plugin_class->size_changed = applications_menu_plugin_size_changed;
- plugin_class->orientation_changed =
applications_menu_plugin_orientation_changed;
+ plugin_class->mode_changed = applications_menu_plugin_mode_changed;
plugin_class->configure_plugin = applications_menu_plugin_configure_plugin;
plugin_class->remote_event = applications_menu_plugin_remote_event;
@@ -343,6 +343,14 @@ applications_menu_plugin_set_property (GObject
*object,
plugin->button_title != NULL ? plugin->button_title : "");
gtk_widget_set_tooltip_text (plugin->button,
exo_str_is_empty (plugin->button_title) ? NULL :
plugin->button_title);
+
+ /* check if the label still fits */
+ if (xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin)) ==
XFCE_PANEL_PLUGIN_MODE_DESKBAR
+ && plugin->show_button_title)
+{
+ applications_menu_plugin_size_changed (XFCE_PANEL_PLUGIN (plugin),
+ xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin)));
+}
return;
case PROP_BUTTON_ICON:
@@ -420,39 +428,73 @@ applications_menu_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
gint size)
{
ApplicationsMenuPlugin *plugin = XFCE_APPLICATIONS_MENU_PLUGIN
(panel_plugin);
+ gintrow_size;
ginticon_size;
GtkStyle *style;
+ XfcePanelPluginMode mode;
+ GtkRequisition label_size;
+ GtkOrientation orientation;
+ gintborder_thickness;
+
+ row_size = size / xfce_panel_plugin_get_nrows (panel_plugin);
gtk_box_set_child_packing (GTK_BOX (plugin->box), plugin->icon,
!plugin->show_button_title,
!plugin->show_button_title,
0, GTK_PACK_START);
+ mode = xfce_panel_plugin_get_mode (panel_plugin);
+
+ if (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+orientation = GTK_ORIENTATION_HORIZONTAL;
+ else
+orientation = GTK_ORIENTATION_VERTICAL;
+
if (!plugin->show_button_title)
{
xfce_panel_image_set_size (XFCE_PANEL_IMAGE (plugin->icon), -1);
- gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size, size);
+
+ if (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), row_size,
size);
+ else
+gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size,
row_size);
}
else
{
style = gtk_widget_get_style (plugin->button);
- icon_size = size - 2 * MAX (style->xthickness, style->ythickness);
+ border_thickness = 2 * MAX (style->xthickness, style->ythickness) + 2;
+
+ icon_size = row_size - border_thickness;
xfce_panel_image_set_size (XFCE_PANEL_IMAGE (plugin->icon), icon_size);
gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), -1, -1);
+
+ if (mode == XFCE_PANEL_PLUG
[Xfce4-commits] Libxfce4panel: Fix comment.
Updating branch refs/heads/master to d8ff795beb64febb59d7952f05a3f9d68aabfbda (commit) from cc701714aa73dc841c4f9056f9bc22a24e9b2930 (commit) commit d8ff795beb64febb59d7952f05a3f9d68aabfbda Author: Andrzej Date: Mon Dec 12 22:51:34 2011 +0900 Libxfce4panel: Fix comment. (cherry picked from commit 6bb30c94b95d70763374c3be3fb5cc6afecd3365) libxfce4panel/xfce-panel-plugin.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c index 8473fe5..a27d23f 100644 --- a/libxfce4panel/xfce-panel-plugin.c +++ b/libxfce4panel/xfce-panel-plugin.c @@ -1959,7 +1959,7 @@ xfce_panel_plugin_set_small (XfcePanelPlugin *plugin, /** - * xfce_panel_plugin_get_mode: + * xfce_panel_plugin_get_orientation: * @plugin : an #XfcePanelPlugin. * * The orientation of the panel in which the plugin is embedded. @@ -1980,7 +1980,7 @@ xfce_panel_plugin_get_orientation (XfcePanelPlugin *plugin) /** - * xfce_panel_plugin_get_orientation: + * xfce_panel_plugin_get_mode: * @plugin : an #XfcePanelPlugin. * * The mode of the panel in which the plugin is embedded. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Allocate panel size for all plugins.
Updating branch refs/heads/master
to ca464ed6910764a38c290247eb77c1f681e6f22a (commit)
from 500b5a06c74e37026d656bc6f0f59851a4edebab (commit)
commit ca464ed6910764a38c290247eb77c1f681e6f22a
Author: Nick Schermer
Date: Mon Dec 12 19:50:53 2011 +0100
Panel: Allocate panel size for all plugins.
panel/panel-itembar.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 351ab01..fbd42bc 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -601,7 +601,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
if (IS_HORIZONTAL (itembar))
{
- child_alloc.height = MIN (itembar->size, child_req.height);
+ child_alloc.height = itembar->size;
child_alloc.width = child_len;
/* pack next small item below this one */
@@ -609,7 +609,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
}
else
{
- child_alloc.width = MIN (itembar->size, child_req.width);
+ child_alloc.width = itembar->size;
child_alloc.height = child_len;
/* pack next time right of this one */
@@ -651,14 +651,14 @@ panel_itembar_size_allocate (GtkWidget *widget,
if (IS_HORIZONTAL (itembar))
{
- child_alloc.height = MIN (rows_size, child_req.height);
+ child_alloc.height = rows_size;
child_alloc.width = child_len;
x += child_len;
}
else
{
- child_alloc.width = MIN (rows_size, child_req.width);
+ child_alloc.width = rows_size;
child_alloc.height = child_len;
y += child_len;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Changed page step for nrows slider to 1.
Updating branch refs/heads/master to cefedfe485fa9308a4de66be65d9a723f4c8213b (commit) from ca464ed6910764a38c290247eb77c1f681e6f22a (commit) commit cefedfe485fa9308a4de66be65d9a723f4c8213b Author: Andrzej Date: Mon Dec 12 01:54:26 2011 +0900 Panel: Changed page step for nrows slider to 1. (cherry picked from commit 22b63ca5d140a1210a74079b42ef164891e19d8d) panel/panel-preferences-dialog.glade |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index 268a10a..92d7dc8 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -70,7 +70,7 @@ 1 6 1 -10 +1 100 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Change drop highlighting to a red line.
Updating branch refs/heads/master
to 802aed3c863b9257510cb7c7b28b8ded98892947 (commit)
from 664f9473f847b11edb2d8be3d008141d8289a4a6 (commit)
commit 802aed3c863b9257510cb7c7b28b8ded98892947
Author: Nick Schermer
Date: Sun Dec 11 21:40:15 2011 +0100
Panel: Change drop highlighting to a red line.
Based on a patch of Andrzej.
panel/panel-itembar.c | 74
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 1209f77..351ab01 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -30,6 +30,7 @@
#include
#define IS_HORIZONTAL(itembar) ((itembar)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+#define HIGHLIGHT_SIZE 2
@@ -370,7 +371,7 @@ panel_itembar_size_request (GtkWidget *widget,
else
{
/* this noop item is the dnd position */
- total_len += itembar->size;
+ total_len += HIGHLIGHT_SIZE;
}
}
@@ -407,6 +408,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
gint shrink_len_avail, shrink_len_req;
gint itembar_len;
gint x, y;
+ gint x_init, y_init;
gboolean expand_children_fit;
gint new_len;
gint child_len;
@@ -490,7 +492,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
else
{
/* dnd separator */
- expand_len_avail -= itembar->size;
+ expand_len_avail -= HIGHLIGHT_SIZE;
}
}
@@ -510,8 +512,8 @@ panel_itembar_size_allocate (GtkWidget *widget,
}
/* init coordinates for first child */
- x = allocation->x + border_width;
- y = allocation->y + border_width;
+ x = x_init = allocation->x + border_width;
+ y = y_init = allocation->y + border_width;
/* init counters for small child packing */
row_max_size = 0;
@@ -528,14 +530,23 @@ panel_itembar_size_allocate (GtkWidget *widget,
/* the highlight item for which we keep some spare space */
if (G_UNLIKELY (child == NULL))
{
- itembar->highlight_x = x;
- itembar->highlight_y = y;
- expand_len_avail -= itembar->size;
if (IS_HORIZONTAL (itembar))
-x += itembar->size;
+{
+ itembar->highlight_x = x;
+ itembar->highlight_y = y_init;
+
+ x += HIGHLIGHT_SIZE;
+}
else
-y += itembar->size;
+{
+ itembar->highlight_x = x_init;
+ itembar->highlight_y = y;
+
+ y += HIGHLIGHT_SIZE;
+}
+
+ expand_len_avail -= HIGHLIGHT_SIZE;
continue;
}
@@ -613,12 +624,12 @@ panel_itembar_size_allocate (GtkWidget *widget,
if (IS_HORIZONTAL (itembar)) \
{ \
x += row_max_size; \
- y = allocation->y + border_width; \
+ y = y_init; \
} \
else \
{ \
y += row_max_size; \
- x = allocation->x + border_width; \
+ x = x_init; \
} \
\
col_count = 0; \
@@ -664,20 +675,45 @@ static gboolean
panel_itembar_expose_event (GtkWidget *widget,
GdkEventExpose *event)
{
- gboolean result;
PanelItembar *itembar = PANEL_ITEMBAR (widget);
+ gboolean result;
+ cairo_t *cr;
+ GdkWindow*window;
+ GdkRectangle rect;
+ gint row_size;
result = (*GTK_WIDGET_CLASS (panel_itembar_parent_class)->expose_event)
(widget, event);
if (itembar->highlight_index != -1)
{
- gtk_paint_box (widget->style, widget->window,
- GTK_STATE_NORMAL, GTK_SHADOW_OUT,
- &event->area, widget, "panel-dnd",
- itembar->highlight_x + 1,
- itembar->highlight_y + 1,
- itembar->size - 2,
- itembar->size - 2);
+ row_size = itembar->size * itembar->nrows;
+
+ rect.x = itembar->highlight_x - 1;
+ rect.y = itembar->highlight_y - 1;
+
+ if (IS_HORIZONTAL (itembar))
+{
+ rect.width = HIGHLIGHT_SIZE;
+ rect.height = row_size;
+}
+ else
+{
+ rect.height = HIGHLIGHT_SIZE;
+ rect.width = row_size;
+}
+
+ /* draw highlight box */
+ window = gtk_widget_get_window (widget);
+ cr = gdk_cairo_create (window);
+ cairo_set_source_rgb (cr, 1.00, 0.00, 0.00);
+
+ gdk_cairo_rectangle (cr, &event->area);
+ cairo_clip (cr);
+
+ gdk_cairo_rectangle (cr, &rect);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
}
return result;
___
Xfce4-commits mailing list
Xfce4-com
[Xfce4-commits] Libxfce4panel: Increase the maximum size to 128 * 6 for rows.
Updating branch refs/heads/master
to 500b5a06c74e37026d656bc6f0f59851a4edebab (commit)
from 802aed3c863b9257510cb7c7b28b8ded98892947 (commit)
commit 500b5a06c74e37026d656bc6f0f59851a4edebab
Author: Andrzej
Date: Sun Dec 11 21:47:58 2011 +0100
Libxfce4panel: Increase the maximum size to 128 * 6 for rows.
Thw maximum row size is 128, maximum number of rows 6.
libxfce4panel/xfce-panel-plugin.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index faacc0a..8473fe5 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -575,7 +575,7 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
g_param_spec_int ("size",
"Size",
"Size of the plugin's
panel",
- 0, 128, 0,
+ 0, (128 * 6), 0,
G_PARAM_READABLE
|
G_PARAM_STATIC_STRINGS));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Add row and small plugin handling in the itembar.
Updating branch refs/heads/master
to f6034625935536a15c18461c5bf32a92ca180767 (commit)
from 5b1bf346de754c46f610828d38b4e9c9df1ea5fd (commit)
commit f6034625935536a15c18461c5bf32a92ca180767
Author: Andrzej
Date: Sun Dec 11 21:07:26 2011 +0100
Panel: Add row and small plugin handling in the itembar.
panel/panel-itembar.c | 334 +++--
1 files changed, 238 insertions(+), 96 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 6cfa482..1209f77 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2008-2010 Nick Schermer
+ * Copyright (C) 2008-2011 Nick Schermer
+ * Copyright (C) 2011 Andrzej
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,7 +29,7 @@
#include
-#define HORIZONTAL(itembar) ((itembar)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+#define IS_HORIZONTAL(itembar) ((itembar)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
@@ -88,8 +89,8 @@ struct _PanelItembar
/* some properties we clone from the panel window */
XfcePanelPluginMode mode;
- guintsize;
- guintnrows;
+ gint size;
+ gint nrows;
/* dnd support */
gint highlight_index;
@@ -294,7 +295,12 @@ panel_itembar_finalize (GObject *object)
(*G_OBJECT_CLASS (panel_itembar_parent_class)->finalize) (object);
}
+#define CHILD_FITS_IN_ROW(child_req, itembar) \
+ ((IS_HORIZONTAL (itembar) && child_req.height <= (itembar)->size) \
+ || (!IS_HORIZONTAL (itembar) && child_req.width <= (itembar)->size))
+#define CHILD_LENGTH(child_req, itembar) \
+ (IS_HORIZONTAL (itembar) ? child_req.width : child_req.height)
static void
panel_itembar_size_request (GtkWidget *widget,
@@ -303,56 +309,86 @@ panel_itembar_size_request (GtkWidget *widget,
PanelItembar *itembar = PANEL_ITEMBAR (widget);
GSList*li;
PanelItembarChild *child;
- GtkRequisition child_requisition;
+ GtkRequisition child_req;
gint border_width;
- gint row_length = 0;
+ gint row_max_size;
+ gint col_count;
+ gint rows_size;
+ gint total_len;
+ gint child_len;
- /* intialize the requisition, we always set the panel height */
- if (HORIZONTAL (itembar))
-{
- requisition->height = itembar->size;
- requisition->width = 0;
-}
- else
-{
- requisition->height = 0;
- requisition->width = itembar->size;
-}
+ /* total length we request */
+ total_len = 0;
- /* get the size requests of the children and use the longest row for
- * the requested width/height when we have wrap items */
- for (li = itembar->children; li != NULL; li = g_slist_next (li))
+ /* counter for small child packing */
+ row_max_size = 0;
+ col_count = 0;
+
+ for (li = itembar->children; li != NULL; li = li->next)
{
child = li->data;
+
if (G_LIKELY (child != NULL))
{
if (!GTK_WIDGET_VISIBLE (child->widget))
continue;
- gtk_widget_size_request (child->widget, &child_requisition);
+ /* get the child's size request */
+ gtk_widget_size_request (child->widget, &child_req);
- if (HORIZONTAL (itembar))
-row_length += child_requisition.width;
- else
-row_length += child_requisition.height;
+ /* check if the small child fits in a row */
+ if (child->option == CHILD_OPTION_SMALL
+ && itembar->nrows > 1
+ && CHILD_FITS_IN_ROW (child_req, itembar))
+{
+ child_len = CHILD_LENGTH (child_req, itembar);
+
+ /* make sure we have enough space for all the children on the
row.
+ * so add the difference between the largest child in this
column */
+ if (child_len > row_max_size)
+{
+ total_len += child_len - row_max_size;
+ row_max_size = child_len;
+}
+
+ /* reset to new row if all columns are filled */
+ if (++col_count >= itembar->nrows)
+{
+ col_count = 0;
+ row_max_size = 0;
+}
+}
+ else /* expanding or normal item */
+{
+ total_len += CHILD_LENGTH (child_req, itembar);
+
+ /* reset column packing */
+ col_count = 0;
+ row_max_size = 0;
+}
}
else
{
/* this noop item is the dnd position */
- row_length += itembar->size;
+ total_len += itembar->size;
}
}
- /* also take the last row_length into account */
- if (HORIZONTAL (itembar)
[Xfce4-commits] Windowmenu: Set the small property.
Updating branch refs/heads/master
to 664f9473f847b11edb2d8be3d008141d8289a4a6 (commit)
from 0bbdda534d4f3343788dbb583bea87b75929a730 (commit)
commit 664f9473f847b11edb2d8be3d008141d8289a4a6
Author: Andrzej
Date: Sun Dec 11 16:57:39 2011 +0100
Windowmenu: Set the small property.
plugins/windowmenu/windowmenu.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 344478a..c96123a 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -329,6 +329,7 @@ window_menu_plugin_set_property (GObject *object,
gtk_widget_hide (plugin->icon);
/* update the plugin */
+ xfce_panel_plugin_set_small (panel_plugin, plugin->button_style ==
BUTTON_STYLE_ICON);
window_menu_plugin_size_changed (panel_plugin,
xfce_panel_plugin_get_size (panel_plugin));
window_menu_plugin_screen_position_changed (panel_plugin,
@@ -451,6 +452,7 @@ window_menu_plugin_construct (XfcePanelPlugin *panel_plugin)
/* show configure */
xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin));
+ xfce_panel_plugin_set_small (panel_plugin, TRUE);
/* bind all properties */
panel_properties_bind (NULL, G_OBJECT (plugin),
@@ -520,6 +522,7 @@ window_menu_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
if (plugin->button_style == BUTTON_STYLE_ICON)
{
/* square the plugin */
+ size /= xfce_panel_plugin_get_nrows (panel_plugin);
gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Showdesktop: Set the small property.
Updating branch refs/heads/master
to 0bbdda534d4f3343788dbb583bea87b75929a730 (commit)
from d542b93d0504c869460d85f186175f1d730c5be1 (commit)
commit 0bbdda534d4f3343788dbb583bea87b75929a730
Author: Andrzej
Date: Sun Dec 11 16:49:53 2011 +0100
Showdesktop: Set the small property.
plugins/showdesktop/showdesktop.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/plugins/showdesktop/showdesktop.c
b/plugins/showdesktop/showdesktop.c
index b7d7388..656c422 100644
--- a/plugins/showdesktop/showdesktop.c
+++ b/plugins/showdesktop/showdesktop.c
@@ -31,6 +31,7 @@
static void show_desktop_plugin_screen_changed (GtkWidget
*widget,
GdkScreen
*previous_screen);
+static void show_desktop_plugin_construct (XfcePanelPlugin
*panel_plugin);
static void show_desktop_plugin_free_data (XfcePanelPlugin
*panel_plugin);
static gboolean show_desktop_plugin_size_changed(XfcePanelPlugin
*panel_plugin,
gint
size);
@@ -73,6 +74,7 @@ show_desktop_plugin_class_init (ShowDesktopPluginClass *klass)
XfcePanelPluginClass *plugin_class;
plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
+ plugin_class->construct = show_desktop_plugin_construct;
plugin_class->free_data = show_desktop_plugin_free_data;
plugin_class->size_changed = show_desktop_plugin_size_changed;
}
@@ -110,6 +112,14 @@ show_desktop_plugin_init (ShowDesktopPlugin *plugin)
static void
+show_desktop_plugin_construct (XfcePanelPlugin *panel_plugin)
+{
+ xfce_panel_plugin_set_small (panel_plugin, TRUE);
+}
+
+
+
+static void
show_desktop_plugin_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen)
{
@@ -172,6 +182,7 @@ show_desktop_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
panel_return_val_if_fail (XFCE_IS_SHOW_DESKTOP_PLUGIN (panel_plugin), FALSE);
/* keep the button squared */
+ size /= xfce_panel_plugin_get_nrows (panel_plugin);
gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size, size);
return TRUE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Directorymenu: Set the small property.
Updating branch refs/heads/master
to d542b93d0504c869460d85f186175f1d730c5be1 (commit)
from f6034625935536a15c18461c5bf32a92ca180767 (commit)
commit d542b93d0504c869460d85f186175f1d730c5be1
Author: Andrzej
Date: Sun Dec 11 16:46:02 2011 +0100
Directorymenu: Set the small property.
plugins/directorymenu/directorymenu.c | 21 -
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/plugins/directorymenu/directorymenu.c
b/plugins/directorymenu/directorymenu.c
index 88341a5..48a956e 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -85,6 +85,8 @@ static void directory_menu_plugin_set_property
(GObject
static void directory_menu_plugin_construct(XfcePanelPlugin
*panel_plugin);
static void directory_menu_plugin_free_file_patterns
(DirectoryMenuPlugin *plugin);
static void directory_menu_plugin_free_data(XfcePanelPlugin
*panel_plugin);
+static gboolean directory_menu_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
+ gint
size);
static void directory_menu_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
static gboolean directory_menu_plugin_remote_event (XfcePanelPlugin
*panel_plugin,
const gchar
*name,
@@ -116,6 +118,7 @@ directory_menu_plugin_class_init (DirectoryMenuPluginClass
*klass)
plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
plugin_class->construct = directory_menu_plugin_construct;
plugin_class->free_data = directory_menu_plugin_free_data;
+ plugin_class->size_changed = directory_menu_plugin_size_changed;
plugin_class->configure_plugin = directory_menu_plugin_configure_plugin;
plugin_class->remote_event = directory_menu_plugin_remote_event;
@@ -295,7 +298,9 @@ directory_menu_plugin_construct (XfcePanelPlugin
*panel_plugin)
{ NULL }
};
- xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin));
+ xfce_panel_plugin_menu_show_configure (panel_plugin);
+
+ xfce_panel_plugin_set_small (panel_plugin, TRUE);
/* bind all properties */
panel_properties_bind (NULL, G_OBJECT (plugin),
@@ -340,6 +345,20 @@ directory_menu_plugin_free_data (XfcePanelPlugin
*panel_plugin)
+static gboolean
+directory_menu_plugin_size_changed (XfcePanelPlugin *panel_plugin,
+gint size)
+{
+ /* force a square button */
+ size /= xfce_panel_plugin_get_nrows (panel_plugin);
+ gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size, size);
+
+ return TRUE;
+}
+
+
+
+
static void
directory_menu_plugin_configure_plugin_file_set (GtkFileChooserButton *button,
DirectoryMenuPlugin *plugin)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Libxfce4panel: The returned size to plugins is row_size * nrows.
Updating branch refs/heads/master
to 5b1bf346de754c46f610828d38b4e9c9df1ea5fd (commit)
from 142b8603d840a6c9418516b0fa5d03c7074a0955 (commit)
commit 5b1bf346de754c46f610828d38b4e9c9df1ea5fd
Author: Nick Schermer
Date: Sun Dec 11 21:04:01 2011 +0100
Libxfce4panel: The returned size to plugins is row_size * nrows.
This way plugins get the same height as they got before. If plugins
want to implement a small plugin, they need to do the following:
static gboolean
plugin_size_changed (XfcePanelPlugin *panel_plugin,
gint size)
{
size /= xfce_panel_plugin_get_nrows (panel_plugin);
gtk_widget_set_size_request (GTK_WIDGET (panel_plugin), size, size);
return TRUE;
}
and set xfce_panel_plugin_set_small (panel_plugin, TRUE); somewhere
during initialization.
libxfce4panel/xfce-panel-plugin.c | 29 -
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index 6356b1e..faacc0a 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -170,7 +170,7 @@ struct _XfcePanelPluginPrivate
gint unique_id;
gchar *property_base;
gchar **arguments;
- gint size;
+ gint size; /* single row size */
guintexpand : 1;
guintshrink : 1;
guintnrows;
@@ -799,7 +799,7 @@ xfce_panel_plugin_get_property (GObject*object,
break;
case PROP_SIZE:
- g_value_set_int (value, private->size);
+ g_value_set_int (value, private->size * private->nrows);
break;
case PROP_NROWS:
@@ -1352,20 +1352,23 @@ xfce_panel_plugin_set_size (XfcePanelPluginProvider
*provider,
{
XfcePanelPlugin *plugin = XFCE_PANEL_PLUGIN (provider);
gboolean handled = FALSE;
+ gint real_size;
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (provider));
+ real_size = size * plugin->priv->nrows;
+
/* check if update is required */
- if (G_LIKELY (plugin->priv->size != size))
+ if (G_LIKELY (plugin->priv->size != real_size))
{
plugin->priv->size = size;
g_signal_emit (G_OBJECT (plugin),
- plugin_signals[SIZE_CHANGED], 0, size, &handled);
+ plugin_signals[SIZE_CHANGED], 0, real_size, &handled);
/* handle the size when not done by the plugin */
if (!handled)
-gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
+gtk_widget_set_size_request (GTK_WIDGET (plugin), real_size,
real_size);
g_object_notify (G_OBJECT (plugin), "size");
}
@@ -1417,6 +1420,8 @@ xfce_panel_plugin_set_nrows (XfcePanelPluginProvider
*provider,
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (provider));
+ nrows = MAX (nrows, 1);
+
/* check if update is required */
if (G_LIKELY (plugin->priv->nrows != nrows))
{
@@ -1426,6 +1431,9 @@ xfce_panel_plugin_set_nrows (XfcePanelPluginProvider
*provider,
plugin_signals[NROWS_CHANGED], 0, nrows);
g_object_notify (G_OBJECT (plugin), "nrows");
+
+ /* also the size changed */
+ xfce_panel_plugin_set_size (provider, plugin->priv->size);
}
}
@@ -1770,11 +1778,14 @@ xfce_panel_plugin_get_arguments (XfcePanelPlugin
*plugin)
gint
xfce_panel_plugin_get_size (XfcePanelPlugin *plugin)
{
+ gint real_size;
+
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), -1);
g_return_val_if_fail (XFCE_PANEL_PLUGIN_CONSTRUCTED (plugin), -1);
/* always return a 'positive' size that makes sence */
- return MAX (16, plugin->priv->size);
+ real_size = plugin->priv->size * plugin->priv->nrows;
+ return MAX (16, real_size);
}
@@ -1818,7 +1829,7 @@ xfce_panel_plugin_set_expand (XfcePanelPlugin *plugin,
expand = !!expand;
/* check if update is required */
- if (G_LIKELY (xfce_panel_plugin_get_expand (plugin) != expand))
+ if (G_LIKELY (plugin->priv->expand != expand))
{
plugin->priv->expand = expand;
@@ -1876,7 +1887,7 @@ xfce_panel_plugin_set_shrink (XfcePanelPlugin *plugin,
shrink = !!shrink;
/* check if update is required */
- if (G_LIKELY (xfce_panel_plugin_get_shrink (plugin) != shrink))
+ if (G_LIKELY (plugin->priv->shrink != shrink))
{
plugin->priv->shrink = shrink;
@@ -1932,7 +1943,7 @@ xfce_panel_plugin_set_small (XfcePanelPlugin *plugin,
small = !!small;
/* check if update is required */
- if (G_LIKELY (xfce_panel_plugin_get_small (plugin) != small))
+ if (G_LIKELY (plugin->priv->small != small))
{
plugin->priv->small = small;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Add a single option for the itembar child types.
Updating branch refs/heads/master
to 142b8603d840a6c9418516b0fa5d03c7074a0955 (commit)
from ace05f97355535c29d2f28fa0d315c236292a63f (commit)
commit 142b8603d840a6c9418516b0fa5d03c7074a0955
Author: Nick Schermer
Date: Sun Dec 11 18:15:49 2011 +0100
Panel: Add a single option for the itembar child types.
This makes it easier to understand in the code, only
a single option of expand/shrink/small works property.
Also warn if a plugin tries to enable 2 of them.
panel/panel-itembar.c | 76
1 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index e0f0ba6..6cfa482 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -84,24 +84,31 @@ struct _PanelItembar
{
GtkContainer __parent__;
- GSList *children;
+ GSList *children;
/* some properties we clone from the panel window */
- XfcePanelPluginMode mode;
- guint size;
- guint nrows;
+ XfcePanelPluginMode mode;
+ guintsize;
+ guintnrows;
/* dnd support */
- ginthighlight_index;
- ginthighlight_x, highlight_y;
+ gint highlight_index;
+ gint highlight_x, highlight_y;
};
+typedef enum
+{
+ CHILD_OPTION_NONE,
+ CHILD_OPTION_EXPAND,
+ CHILD_OPTION_SHRINK,
+ CHILD_OPTION_SMALL
+}
+ChildOptions;
+
struct _PanelItembarChild
{
- GtkWidget *widget;
- guint expand : 1;
- guint shrink : 1;
- guint small : 1;
+ GtkWidget*widget;
+ ChildOptions option;
};
enum
@@ -394,7 +401,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
gtk_widget_get_child_requisition (child->widget, &child_req);
length = HORIZONTAL (itembar) ? child_req.width : child_req.height;
- if (G_UNLIKELY (child->expand))
+ if (G_UNLIKELY (child->option == CHILD_OPTION_EXPAND))
{
expand_length_req += length;
}
@@ -402,7 +409,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
{
expand_length_avail -= length;
- if (child->shrink)
+ if (child->option == CHILD_OPTION_SHRINK)
shrink_length_avail += length;
}
}
@@ -461,7 +468,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
child_length = HORIZONTAL (itembar) ? child_req.width : child_req.height;
- if (G_UNLIKELY (!expand_children_fit && child->expand))
+ if (G_UNLIKELY (!expand_children_fit && child->option ==
CHILD_OPTION_EXPAND))
{
/* equally share the length between the expanding plugins */
panel_assert (expand_length_req > 0);
@@ -472,7 +479,7 @@ panel_itembar_size_allocate (GtkWidget *widget,
child_length = new_length;
}
- else if (child->shrink && shrink_length_req > 0)
+ else if (child->option == CHILD_OPTION_SHRINK && shrink_length_req > 0)
{
/* equally shrink all shrinking plugins */
panel_assert (shrink_length_avail > 0);
@@ -614,7 +621,8 @@ panel_itembar_set_child_property (GtkContainer *container,
GParamSpec *pspec)
{
PanelItembarChild *child;
- gboolean boolean;
+ gboolean enable;
+ ChildOptions option;
child = panel_itembar_get_child (PANEL_ITEMBAR (container), widget);
if (G_UNLIKELY (child == NULL))
@@ -623,31 +631,35 @@ panel_itembar_set_child_property (GtkContainer *container,
switch (prop_id)
{
case CHILD_PROP_EXPAND:
- boolean = g_value_get_boolean (value);
- if (child->expand == boolean)
-return;
- child->expand = boolean;
+ option = CHILD_OPTION_EXPAND;
break;
case CHILD_PROP_SHRINK:
- boolean = g_value_get_boolean (value);
- if (child->shrink == boolean)
-return;
- child->shrink = boolean;
+ option = CHILD_OPTION_SHRINK;
break;
case CHILD_PROP_SMALL:
- boolean = g_value_get_boolean (value);
- if (child->small == boolean)
-return;
- child->small = boolean;
+ option = CHILD_OPTION_SMALL;
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (container, prop_id, pspec);
- break;
+ return;
}
+ /* warn if we override an old option */
+ if (child->option != CHILD_OPTION_NONE
+ && child->option != option)
+g_warning ("Itembar child can only enable only of expand, shrink or
small.");
+
+ /* leave if nothing changes */
+ enable = g_value_get_boolean (value);
+ if ((!enable && child->option == CHILD_OPTION_NONE)
+ || (enable && child->option == option))
+return;
+
+ child->option = enable ? option : CHILD_OPTION_NONE;
+
gtk_widget_queue_resize (GTK_WIDGET (container));
}
@@ -669,15 +681,15 @@ panel_itembar_ge
[Xfce4-commits] Squashme 53544a44: Rename HORIZONTAL to IS_HORIZONTAL.
Updating branch refs/heads/master
to ace05f97355535c29d2f28fa0d315c236292a63f (commit)
from be1e8c849a68e16c88ffbe667180f8a14de71bd5 (commit)
commit ace05f97355535c29d2f28fa0d315c236292a63f
Author: Nick Schermer
Date: Sat Dec 10 17:53:41 2011 +0100
Squashme 53544a44: Rename HORIZONTAL to IS_HORIZONTAL.
panel/panel-window.c | 48
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/panel/panel-window.c b/panel/panel-window.c
index a995962..ba16a7f 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -61,7 +61,7 @@
#define HANDLE_SIZE (HANDLE_DOTS * (HANDLE_PIXELS + \
HANDLE_PIXEL_SPACE) - HANDLE_PIXEL_SPACE)
#define HANDLE_SIZE_TOTAL (2 * HANDLE_SPACING + HANDLE_SIZE)
-#define HORIZONTAL(window)((window)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+#define IS_HORIZONTAL(window) ((window)->mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
@@ -740,7 +740,7 @@ panel_window_expose_event (GtkWidget *widget,
if (window->position_locked || !GTK_WIDGET_DRAWABLE (widget))
goto end;
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
{
handle_h = window->alloc.height / 2;
handle_w = HANDLE_SIZE;
@@ -1133,7 +1133,7 @@ panel_window_size_request (GtkWidget *widget,
/* handle size */
if (!window->position_locked)
{
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
extra_width += 2 * HANDLE_SIZE_TOTAL;
else
extra_height += 2 * HANDLE_SIZE_TOTAL;
@@ -1154,7 +1154,7 @@ panel_window_size_request (GtkWidget *widget,
requisition->width = child_requisition.width + extra_width;
/* respect the length and monitor/screen size */
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
{
if (!window->length_adjust)
requisition->width = extra_width;
@@ -1216,7 +1216,7 @@ panel_window_size_allocate (GtkWidget *widget,
/* corner or floating panel */
default:
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
w = alloc->width;
else
h = alloc->height;
@@ -1275,7 +1275,7 @@ panel_window_size_allocate (GtkWidget *widget,
/* keep space for the panel handles if not locked */
if (!window->position_locked)
{
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
{
child_alloc.width -= 2 * HANDLE_SIZE_TOTAL;
child_alloc.x += HANDLE_SIZE_TOTAL;
@@ -1469,31 +1469,31 @@ panel_window_screen_struts_edge (PanelWindow *window)
case SNAP_POSITION_E:
case SNAP_POSITION_EC:
- return HORIZONTAL (window) ? STRUTS_EDGE_NONE : STRUTS_EDGE_RIGHT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_NONE : STRUTS_EDGE_RIGHT;
case SNAP_POSITION_NE:
- return HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_RIGHT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_RIGHT;
case SNAP_POSITION_SE:
- return HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_RIGHT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_RIGHT;
case SNAP_POSITION_W:
case SNAP_POSITION_WC:
- return HORIZONTAL (window) ? STRUTS_EDGE_NONE : STRUTS_EDGE_LEFT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_NONE : STRUTS_EDGE_LEFT;
case SNAP_POSITION_NW:
- return HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_LEFT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_LEFT;
case SNAP_POSITION_SW:
- return HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_LEFT;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_LEFT;
case SNAP_POSITION_NC:
case SNAP_POSITION_N:
- return HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_NONE;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_TOP : STRUTS_EDGE_NONE;
case SNAP_POSITION_SC:
case SNAP_POSITION_S:
- return HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_NONE;
+ return IS_HORIZONTAL (window) ? STRUTS_EDGE_BOTTOM : STRUTS_EDGE_NONE;
}
return STRUTS_EDGE_NONE;
@@ -1675,7 +1675,7 @@ panel_window_screen_update_borders (PanelWindow *window)
/* don't show the side borders if the length is 100% */
if (window->length == 1.00)
{
- if (HORIZONTAL (window))
+ if (IS_HORIZONTAL (window))
PANEL_UNSET_FLAG (borders, PANEL_BORDER_LEFT | PANEL_BORDER_RIGHT);
else
PANEL_UNSET_FLAG (borders, PANEL_BORDER_TOP | PANEL_BORDER_BOTTOM);
@@ -2470,51 +2470,51 @@ panel_window_plugin_set_screen_position (GtkWidget
*widget,
switch (window->snap_position)
{
case SNAP_POSITION_NONE:
- position = HORIZONTAL (window) ? XFCE_SCREEN_POSITION_FLOATING_H :
+ position = IS_HORIZONTAL (window) ? XFCE_SCREEN_POSITION_FLOATING_H :
[Xfce4-commits] Squashme 53544a44: Add missing prover info.
Updating branch refs/heads/master to be1e8c849a68e16c88ffbe667180f8a14de71bd5 (commit) from 0c15ac55ad681e37c998c0169693f87070423c26 (commit) commit be1e8c849a68e16c88ffbe667180f8a14de71bd5 Author: Nick Schermer Date: Sun Dec 11 16:42:12 2011 +0100 Squashme 53544a44: Add missing prover info. panel/panel-window.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel/panel-window.c b/panel/panel-window.c index b0b121c..a995962 100644 --- a/panel/panel-window.c +++ b/panel/panel-window.c @@ -2590,6 +2590,7 @@ panel_window_set_povider_info (PanelWindow *window, panel_window_plugin_set_mode (provider, window); panel_window_plugin_set_screen_position (provider, window); panel_window_plugin_set_size (provider, window); + panel_window_plugin_set_nrows (provider, window); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Separator: Remove new line option.
Updating branch refs/heads/master
to 0c15ac55ad681e37c998c0169693f87070423c26 (commit)
from a2a8232e2f894381f5b4c1e451a956bac1c1b8ba (commit)
commit 0c15ac55ad681e37c998c0169693f87070423c26
Author: Nick Schermer
Date: Sun Dec 11 16:34:52 2011 +0100
Separator: Remove new line option.
This will be replaced by the nrows property.
libxfce4panel/libxfce4panel.symbols|1 +
libxfce4panel/xfce-panel-plugin-provider.h |2 -
panel/panel-application.c | 10 -
panel/panel-itembar.c | 305 ++--
plugins/separator/separator-dialog.glade |3 -
plugins/separator/separator.c | 29 +--
6 files changed, 115 insertions(+), 235 deletions(-)
diff --git a/libxfce4panel/libxfce4panel.symbols
b/libxfce4panel/libxfce4panel.symbols
index 3730482..64a299e 100644
--- a/libxfce4panel/libxfce4panel.symbols
+++ b/libxfce4panel/libxfce4panel.symbols
@@ -45,6 +45,7 @@ libxfce4panel_minor_version
#if IN_HEADER(__LIBXFCE4PANEL_ENUM_TYPES_H__)
#if IN_SOURCE(__LIBXFCE4PANEL_ENUM_TYPES_C__)
xfce_screen_position_get_type G_GNUC_CONST
+xfce_panel_plugin_mode_get_type G_GNUC_CONST
#endif
#endif
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h
b/libxfce4panel/xfce-panel-plugin-provider.h
index ed300c0..e603986 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -79,8 +79,6 @@ typedef enum /*< skip >*/
PROVIDER_SIGNAL_MOVE_PLUGIN = 0,
PROVIDER_SIGNAL_EXPAND_PLUGIN,
PROVIDER_SIGNAL_COLLAPSE_PLUGIN,
- PROVIDER_SIGNAL_WRAP_PLUGIN,
- PROVIDER_SIGNAL_UNWRAP_PLUGIN,
PROVIDER_SIGNAL_SMALL_PLUGIN,
PROVIDER_SIGNAL_UNSMALL_PLUGIN,
PROVIDER_SIGNAL_LOCK_PANEL,
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 2680e25..0d3b493 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -633,16 +633,6 @@ panel_application_plugin_provider_signal
(XfcePanelPluginProvider *provide
NULL);
break;
-case PROVIDER_SIGNAL_WRAP_PLUGIN:
-case PROVIDER_SIGNAL_UNWRAP_PLUGIN:
- itembar = gtk_bin_get_child (GTK_BIN (window));
- gtk_container_child_set (GTK_CONTAINER (itembar),
- GTK_WIDGET (provider),
- "wrap",
- provider_signal == PROVIDER_SIGNAL_WRAP_PLUGIN,
- NULL);
- break;
-
case PROVIDER_SIGNAL_SMALL_PLUGIN:
case PROVIDER_SIGNAL_UNSMALL_PLUGIN:
itembar = gtk_bin_get_child (GTK_BIN (window));
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index cbf845e..e0f0ba6 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -101,7 +101,6 @@ struct _PanelItembarChild
GtkWidget *widget;
guint expand : 1;
guint shrink : 1;
- guint wrap : 1;
guint small : 1;
};
@@ -118,7 +117,6 @@ enum
CHILD_PROP_0,
CHILD_PROP_EXPAND,
CHILD_PROP_SHRINK,
- CHILD_PROP_WRAP,
CHILD_PROP_SMALL
};
@@ -208,13 +206,6 @@ panel_itembar_class_init (PanelItembarClass *klass)
EXO_PARAM_READWRITE));
gtk_container_class_install_child_property (gtkcontainer_class,
- CHILD_PROP_WRAP,
- g_param_spec_boolean ("wrap",
-NULL, NULL,
-FALSE,
-
EXO_PARAM_READWRITE));
-
- gtk_container_class_install_child_property (gtkcontainer_class,
CHILD_PROP_SMALL,
g_param_spec_boolean ("small",
NULL, NULL,
@@ -333,30 +324,10 @@ panel_itembar_size_request (GtkWidget *widget,
gtk_widget_size_request (child->widget, &child_requisition);
- if (G_LIKELY (!child->wrap))
-{
- if (HORIZONTAL (itembar))
-row_length += child_requisition.width;
- else
-row_length += child_requisition.height;
-}
+ if (HORIZONTAL (itembar))
+row_length += child_requisition.width;
else
-{
- /* add to size for new wrap element */
- if (HORIZONTAL (itembar))
-{
- requisition->height += itembar->size;
- requisition->width = MAX (requisition->width, row_length);
-}
- else
-{
- requisition->width += itembar->size;
- requisition->height = MAX (requisition->height, row_length);
-}
-
-
[Xfce4-commits] Add small property for plugins.
Updating branch refs/heads/master
to a2a8232e2f894381f5b4c1e451a956bac1c1b8ba (commit)
from 96baf38570437374795eb2d7e3983adf54df02bd (commit)
commit a2a8232e2f894381f5b4c1e451a956bac1c1b8ba
Author: Andrzej
Date: Sun Dec 11 15:38:36 2011 +0100
Add small property for plugins.
This properly will be used to pack a plugin only on a single row instead
of the whole panel height.
libxfce4panel/xfce-panel-plugin-provider.h |2 +
libxfce4panel/xfce-panel-plugin.c | 90
libxfce4panel/xfce-panel-plugin.h |5 ++
panel/panel-application.c | 10 +++
panel/panel-itembar.c | 22 +++-
5 files changed, 128 insertions(+), 1 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h
b/libxfce4panel/xfce-panel-plugin-provider.h
index 5408fec..ed300c0 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -81,6 +81,8 @@ typedef enum /*< skip >*/
PROVIDER_SIGNAL_COLLAPSE_PLUGIN,
PROVIDER_SIGNAL_WRAP_PLUGIN,
PROVIDER_SIGNAL_UNWRAP_PLUGIN,
+ PROVIDER_SIGNAL_SMALL_PLUGIN,
+ PROVIDER_SIGNAL_UNSMALL_PLUGIN,
PROVIDER_SIGNAL_LOCK_PANEL,
PROVIDER_SIGNAL_UNLOCK_PANEL,
PROVIDER_SIGNAL_REMOVE_PLUGIN,
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index 52f28f8..6356b1e 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -126,6 +126,7 @@ enum
PROP_UNIQUE_ID,
PROP_ORIENTATION,
PROP_SIZE,
+ PROP_SMALL,
PROP_SCREEN_POSITION,
PROP_EXPAND,
PROP_MODE,
@@ -174,6 +175,7 @@ struct _XfcePanelPluginPrivate
guintshrink : 1;
guintnrows;
XfcePanelPluginMode mode;
+ guintsmall : 1;
XfceScreenPosition screen_position;
guintlocked : 1;
GSList *menu_items;
@@ -595,6 +597,24 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
|
G_PARAM_STATIC_STRINGS));
/**
+ * XfcePanelPlugin:small:
+ *
+ * Wether the #XfcePanelPlugin is small enough to fit a single row of a
multi-row panel.
+ * Plugin writes can use it to read or set this property, but
xfce_panel_plugin_set_small()
+ * is recommended.
+ *
+ * Since: 4.10
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_SMALL,
+ g_param_spec_boolean ("small",
+ "Small",
+ "Is this plugin
small, e.g. a single button?",
+ FALSE,
+ G_PARAM_READWRITE
+ |
G_PARAM_STATIC_STRINGS));
+
+ /**
* XfcePanelPlugin:expand:
*
* Wether the #XfcePanelPlugin expands on the panel. Plugin writes can use it
@@ -679,6 +699,7 @@ xfce_panel_plugin_init (XfcePanelPlugin *plugin)
plugin->priv->property_base = NULL;
plugin->priv->arguments = NULL;
plugin->priv->size = 0;
+ plugin->priv->small = FALSE;
plugin->priv->expand = FALSE;
plugin->priv->shrink = FALSE;
plugin->priv->mode = XFCE_PANEL_PLUGIN_MODE_HORIZONTAL;
@@ -781,6 +802,14 @@ xfce_panel_plugin_get_property (GObject*object,
g_value_set_int (value, private->size);
break;
+case PROP_NROWS:
+ g_value_set_uint (value, private->nrows);
+ break;
+
+case PROP_SMALL:
+ g_value_set_boolean (value, private->small);
+ break;
+
case PROP_SCREEN_POSITION:
g_value_set_enum (value, private->screen_position);
break;
@@ -840,6 +869,11 @@ xfce_panel_plugin_set_property (GObject *object,
private->arguments = g_value_dup_boxed (value);
break;
+case PROP_SMALL:
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (object),
+ g_value_get_boolean (value));
+ break;
+
case PROP_EXPAND:
xfce_panel_plugin_set_expand (XFCE_PANEL_PLUGIN (object),
g_value_get_boolean (value));
@@ -1856,6 +1890,62 @@ xfce_panel_plugin_set_shrink (XfcePanelPlugin *plugin,
}
+/**
+ * xfce_panel_plugin_get_small:
+ * @plugin : an #XfcePanelPlugin.
+ *
+ * Whether the plugin is small enough to fit in a single row of
+ * a multi-row panel. E.g. if it is a button-like applet.
+ *
+ * Returns: %TRUE when the plugin is small,
+ * %FALSE otherwise.
+ *
+ * Since: 4.10
+ **/
+gboolean
+xfce_panel_plugin_get_small (XfcePanelPlugin *plugin)
+{
+ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (XFCE_PANEL_PLUGIN_CONSTRUCTED (plugin), FALSE);
+
+ return plugin->priv->small;
+}
+
+
+
+/**
+ * xfce_panel_plugin_set_small:
+ * @plugin :
[Xfce4-commits] Clock: Fix typo in tooltip (bug #8137).
Updating branch refs/heads/master to be15b49f892c7799091b7996d484fbf6f9acc048 (commit) from 8f128968880de6b829f3b3c96e104b8c7bd8d322 (commit) commit be15b49f892c7799091b7996d484fbf6f9acc048 Author: Nick Schermer Date: Sat Dec 24 12:41:29 2011 +0100 Clock: Fix typo in tooltip (bug #8137). plugins/clock/clock-dialog.glade |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index d746706..68e9639 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -119,8 +119,7 @@ True True -The format describes the date and time parts to insert into the file name. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. -• +The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. 1 @@ -268,8 +267,7 @@ True True -The format describes the date and time parts to insert into the file name. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. -• +The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. 1 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix invalid free.
Updating branch refs/heads/master to 7faa02b30d94911e2bcafd63e63a506917d8297c (commit) from 8cfdc4b0d95d8fdf4585961c805643b7c7e48ad2 (commit) commit 7faa02b30d94911e2bcafd63e63a506917d8297c Author: Nick Schermer Date: Sat Dec 24 12:34:29 2011 +0100 Fix invalid free. garcon/garcon-menu-item.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c index e83f300..3c5f603 100644 --- a/garcon/garcon-menu-item.c +++ b/garcon/garcon-menu-item.c @@ -872,7 +872,7 @@ garcon_menu_item_reload_from_file (GarconMenuItem *item, const gchar *name; const gchar *exec; gchar*filename; - gchar*url_exec; + gchar*url_exec = NULL; g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); g_return_val_if_fail (G_IS_FILE (file), FALSE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Launcher: Fix typo in previous commit.
Updating branch refs/heads/master to 8f128968880de6b829f3b3c96e104b8c7bd8d322 (commit) from 97f29f9ff20fa84265df9e3578e32ce55cc3c521 (commit) commit 8f128968880de6b829f3b3c96e104b8c7bd8d322 Author: Nick Schermer Date: Sat Dec 24 12:30:35 2011 +0100 Launcher: Fix typo in previous commit. plugins/launcher/launcher-dialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c index cd08c76..84bdc3b 100644 --- a/plugins/launcher/launcher-dialog.c +++ b/plugins/launcher/launcher-dialog.c @@ -708,7 +708,7 @@ launcher_dialog_tree_popup_menu_activated (GtkWidget *mi, else if (strcmp (name, "mi-move-down") == 0) launcher_dialog_press_event (dialog, "item-move-down"); else if (strcmp (name, "mi-edit") == 0) -launcher_dialog_press_event (dialog, "item-add"); +launcher_dialog_press_event (dialog, "item-edit"); else if (strcmp (name, "mi-delete") == 0) launcher_dialog_press_event (dialog, "item-delete"); else if (strcmp (name, "mi-add") == 0) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to d92d85420c793a0fdcc49c0358efe6fe7f404fec (commit) from d34e016a11abc271b96cbfc47f76c885ec39dec2 (commit) commit d92d85420c793a0fdcc49c0358efe6fe7f404fec Author: Michal Várady Date: Sat Dec 24 12:08:14 2011 +0100 l10n: Updated Czech (cs) translation to 100% New status: 45 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 116 ++ 1 files changed, 56 insertions(+), 60 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6909e59..3f7a701 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,14 +2,14 @@ # Copyright (C) 2004-2005 Eduard Roccatello. # This file is distributed under the same license as the xfce4-appfinder package. # Alois Nespor , 2004. -# Michal Várady , 2006-2010. +# Michal Várady , 2006-2011. # msgid "" msgstr "" "Project-Id-Version: xfce4-appfinder 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-21 20:43+0200\n" -"PO-Revision-Date: 2010-12-11 00:52+0100\n" +"POT-Creation-Date: 2011-12-24 05:30+\n" +"PO-Revision-Date: 2011-12-24 12:07+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech \n" "Language: cs\n" @@ -21,101 +21,98 @@ msgstr "" "X-Poedit-Country: CZECH REPUBLIC\n" #: ../src/appfinder-category-model.c:108 -#, fuzzy msgid "All Applications" -msgstr "Aplikace" +msgstr "Všechny aplikace" -#: ../src/appfinder-model.c:422 +#: ../src/appfinder-model.c:438 msgid "Name" -msgstr "" +msgstr "Název" -#: ../src/appfinder-model.c:423 +#: ../src/appfinder-model.c:439 msgid "Command" -msgstr "" +msgstr "Příkaz" -#: ../src/appfinder-model.c:424 +#: ../src/appfinder-model.c:440 msgid "Categories" msgstr "Kategorie" -#: ../src/appfinder-model.c:425 -#, fuzzy +#: ../src/appfinder-model.c:441 msgid "Filename" -msgstr "Správce souborů" +msgstr "Název souboru" -#: ../src/appfinder-model.c:1317 -#, fuzzy +#: ../src/appfinder-model.c:1598 msgid "Application has no command" -msgstr "Vyhledávač aplikací" +msgstr "Aplikace nemá žádný příkaz" -#: ../src/appfinder-model.c:1634 +#: ../src/appfinder-model.c:1900 msgid "Commands History" -msgstr "" +msgstr "Historie příkazů" #: ../src/appfinder-preferences.c:175 msgid "C_lear" -msgstr "" +msgstr "_Vymazat" #: ../src/appfinder-preferences.c:176 msgid "This will permanently clear the custom command history." -msgstr "" +msgstr "Tato akce trvale vymaže historii vlastních příkazů." #: ../src/appfinder-preferences.c:177 msgid "Are you sure you want to clear the command history?" -msgstr "" +msgstr "Opravdu chcete vymazat historii příkazů?" #: ../src/appfinder-preferences.c:287 msgid "The custom action will be deleted permanently." -msgstr "" +msgstr "Vlastní akce bude trvale smazána." #: ../src/appfinder-preferences.c:288 #, c-format msgid "Are you sure you want to delete pattern \"%s\"?" -msgstr "" +msgstr "Opravdu chcete vymazat vzorek \"%s\"?" -#: ../src/appfinder-window.c:183 ../src/main.c:344 +#: ../src/appfinder-window.c:190 +#: ../src/main.c:344 #: ../src/appfinder-preferences.glade.h:3 #: ../data/xfce4-appfinder.desktop.in.h:1 msgid "Application Finder" msgstr "Vyhledávač aplikací" -#: ../src/appfinder-window.c:224 +#: ../src/appfinder-window.c:231 msgid "Toggle view mode" -msgstr "" +msgstr "Přepnout režim pohledu" #: ../src/main.c:70 msgid "Start in collapsed mode" -msgstr "" +msgstr "Spustit ve sbaleném režimu" #: ../src/main.c:71 -#, fuzzy msgid "Print version information and exit" -msgstr "Informace o verzi" +msgstr "Zobrazí informace o verzi a ukončí se" #: ../src/main.c:72 msgid "Replace the existing service" -msgstr "" +msgstr "Nahradit existující službu" #: ../src/main.c:73 msgid "Quit all instances" -msgstr "" +msgstr "Ukončit všechny instance" #: ../src/main.c:74 msgid "Do not try to use or become a D-Bus service" -msgstr "" +msgstr "Nepokoušet se použít nebo stát se službou sběrnice D-Bus" #. close all windows and quit #: ../src/main.c:159 msgid "Forced to quit" -msgstr "" +msgstr "Vynucené ukončení" #: ../src/main.c:346 msgid "Unable to daemonize the process" -msgstr "" +msgstr "Tento proces nelze přepnout do režimu démon" #: ../src/main.c:418 -#, fuzzy, c-format +#, c-format msgid "Type \"%s --help\" for usage." -msgstr "Informace o použití získáte příkazem '%s --help'." +msgstr "Informace o použití získáte příkazem \"%s --help\"." #: ../src/main.c:429 msgid "The Xfce development team. All rights reserved." @@ -128,87 +125,86 @@ msgstr "Prosíme, abyste chyby nahlásili na adresu <%s>." #: ../src/appfinder-preferences.glade.h:1 msgid "Add a new custom action." -msgstr "" +msgstr "Přidat novou vlastní akci." #: ../src/appfinder-preferences.glade.h:2 msgid "Always c_enter the window" -msgstr "" +msgstr "Vždy vy_středit okno" #: ../src/appfinder-preferences.glade.h:4 msgid "Behaviour" -msgstr "" +msgstr "Chování"
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 2a87e032281a7ec1f72a1d5a97f8d4ed5145b022 (commit) from e99e6c1fb45fd3322bb2fd0bdee4ec9c730dd1e6 (commit) commit 2a87e032281a7ec1f72a1d5a97f8d4ed5145b022 Author: Cristian Marchi Date: Sat Dec 24 10:32:04 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 800 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/it.po b/po/it.po index 0f8a88c..1a96a69 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the orage package. # Alex Dupre , 2004. # Cristian Cozzolino , 2009 -# +# # Gianluca Foddis , 2009, 2009. msgid "" msgstr "" @@ -554,7 +554,7 @@ msgstr "Preferenze dell'orologio di Orage" #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid "%A %d %B %Y/%V" msgstr "%A %d %B %Y/%V" @@ -883,8 +883,8 @@ msgstr "" "Selezionare questa opzione per fare in modo che Orage avvisi comunque anche " "se non è attivo al momento dell'allarme" -# è riferito all'allarme #. Audio Alarm +# è riferito all'allarme #: ../src/appointment.c:2946 msgid "Sound" msgstr "Suono" @@ -1146,8 +1146,8 @@ msgstr "" "\tGiorni della settimana = spuntare solo mercoledì\n" "\tQuale giorno = selezionare 2 dal numero sotto mercoledì " -# TODO=compito #. TODO base (only for TODOs) +# TODO=compito #: ../src/appointment.c:3336 msgid "TODO base" msgstr "Base compito" @@ -1836,7 +1836,7 @@ msgid "Never" msgstr "Mai" #: ../src/mainbox.c:450 ../src/mainbox.c:457 -#, fuzzy, c-format +#, c-format msgid "" "Title: %s\n" " Location: %s\n" @@ -2037,13 +2037,13 @@ msgstr "" #: ../src/parameters.c:910 ../src/parameters.c:915 msgid "Use wakeup timer" -msgstr "" +msgstr "Utilizza timer" #: ../src/parameters.c:921 msgid "" "Use this timer if Orage has problems waking up properly after suspend or " "hibernate. (For example tray icon not refreshed or alarms not firing.)" -msgstr "" +msgstr "Usare questo timer se Orage ha problemi ad avviarsi dopo una sospensione o un'ibernazione (per esempio l'icona di vassoio non viene aggiornata o gli allarmi non vengono eseguiti)." #: ../src/parameters.c:938 msgid "Orage Preferences" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 4447f3d0ec2ff4a065342930737a1c018b332663 (commit) from 9a91bc4f752f5f1fb9d9d7217eb63d4a88a94570 (commit) commit 4447f3d0ec2ff4a065342930737a1c018b332663 Author: Cristian Marchi Date: Sat Dec 24 10:25:28 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 135 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po |9 - 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/it.po b/po/it.po index ae2f21c..b18710c 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # Fabio Vergnani , 2007. # Cristian Marchi , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: ristretto\n" @@ -11,12 +11,11 @@ msgstr "" "POT-Creation-Date: 2011-12-24 04:30+\n" "PO-Revision-Date: 2011-12-24 10:08+0100\n" "Last-Translator: Cristian Marchi \n" -"Language-Team: Italian Translation Team \n" -"Language: \n" +"Language-Team: Italian Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,11,-1,-1,-1\n" #: ../src/main.c:61 @@ -120,7 +119,7 @@ msgstr "Elimina questa immagine dal disco" #: ../src/main_window.c:286 msgid "_Clear private data" -msgstr "_Cancella dati privati" +msgstr "Cancella dati _privati" #: ../src/main_window.c:287 msgid "_Preferences" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 9a91bc4f752f5f1fb9d9d7217eb63d4a88a94570 (commit) from 63247910526bdb69c21ff9a4d90f89695b0e6e54 (commit) commit 9a91bc4f752f5f1fb9d9d7217eb63d4a88a94570 Author: Cristian Marchi Date: Sat Dec 24 10:12:33 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 135 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 41 + 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/po/it.po b/po/it.po index 1c91624..ae2f21c 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2011-12-18 08:43+0100\n" -"PO-Revision-Date: 2009-12-10 19:43+0100\n" +"POT-Creation-Date: 2011-12-24 04:30+\n" +"PO-Revision-Date: 2011-12-24 10:08+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian Translation Team \n" @@ -36,7 +36,7 @@ msgid "Show settings dialog" msgstr "Mostra la finestra delle impostazioni" #: ../src/main.c:105 -#, fuzzy, c-format +#, c-format msgid "" "%s: %s\n" "\n" @@ -44,8 +44,9 @@ msgid "" "available command line options.\n" msgstr "" "%s: %s\n" -"Utilizzare il comando %s --help per visualizzare la lista completa delle " -"opzioni da linea di comando.\n" +"\n" +"Utilizzare il comando %s --help per visualizzare la lista\n" +" completa delle opzioni da linea di comando.\n" #: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 msgid "Image Viewer" @@ -144,9 +145,8 @@ msgstr "Imposta come _sfondo" #. Zoom submenu #: ../src/main_window.c:294 -#, fuzzy msgid "_Zoom" -msgstr "_Ingrandimento" +msgstr "_Zoom" #: ../src/main_window.c:295 msgid "Zoom _In" @@ -225,7 +225,6 @@ msgid "_Position" msgstr "_Posizione" #: ../src/main_window.c:323 -#, fuzzy msgid "Thumbnail Bar _Position" msgstr "_Posizione barra miniature" @@ -246,9 +245,8 @@ msgstr "Mostra la barra degli strumenti di _navigazione" #. Toggle visibility of the thumbnailbar #: ../src/main_window.c:337 -#, fuzzy msgid "Show _Thumbnail Bar" -msgstr "Mostra la barra delle minia_ture" +msgstr "Mostra barra _miniature" #. Sort by Filename #: ../src/main_window.c:344 @@ -312,7 +310,7 @@ msgstr "Vuota" #: ../src/main_window.c:1831 msgid "Choose 'set wallpaper' method" -msgstr "" +msgstr "Seleziona il metodo \"imposta sfondo\"" #: ../src/main_window.c:1846 ../src/preferences_dialog.c:349 msgid "" @@ -320,25 +318,27 @@ msgid "" "This setting determines the method Ristretto will use\n" "to configure the desktop wallpaper." msgstr "" +"Configurazione del sistema che sta gestendo la scrivania.\n" +"Questa impostazione determina il metodo che Ristretto\n" +"utilizzerà per configurare lo sfondo della scrivania." #: ../src/main_window.c:1871 ../src/preferences_dialog.c:373 msgid "None" -msgstr "" +msgstr "Nessuno" #: ../src/main_window.c:1875 ../src/preferences_dialog.c:377 msgid "Xfce" -msgstr "" +msgstr "Xfce" #: ../src/main_window.c:1879 ../src/preferences_dialog.c:381 msgid "GNOME" -msgstr "" +msgstr "GNOME" #: ../src/main_window.c:2381 msgid "Developer:" msgstr "Sviluppatore:" #: ../src/main_window.c:2390 -#, fuzzy msgid "Ristretto is an image viewer for the Xfce desktop environment." msgstr "Ristretto è un visualizzatore di immagini per l'ambiente grafico Xfce." @@ -378,9 +378,8 @@ msgid "Are you sure you want to delete image '%s' from disk?" msgstr "Cancellare davvero l'immagine «%s» dal disco?" #: ../src/privacy_dialog.c:151 -#, fuzzy msgid "Time range to clear:" -msgstr "Intervallo di tempo per la pulizia:" +msgstr "Intervallo di tempo da ripulire:" #: ../src/privacy_dialog.c:155 msgid "Cleanup" @@ -435,7 +434,6 @@ msgid "Thumbnails" msgstr "Miniature" #: ../src/preferences_dialog.c:228 -#, fuzzy msgid "" "The thumbnail bar can be automatically hidden \n" "when the window is fullscreen." @@ -444,7 +442,6 @@ msgstr "" "quando la visualizzazione è a schermo intero." #: ../src/preferences_dialog.c:230 -#, fuzzy msgid "Hide thumbnail bar when fullscreen" msgstr "Nascondi la barra delle miniature quando a schermo intero" @@ -469,12 +466,10 @@ msgid "Control" msgstr "Controlli" #: ../src/preferences_dialog.c:293 -#, fuzzy msgid "Scroll wheel" msgstr "Rotella del mouse" #: ../src/preferences_dialog.c:296 -#, fuzzy msgid "Invert zoom direction" msgstr "Inverti la direzione dello zoom" @@ -496,7 +491,7 @@ msgstr "Scorrimento continuo delle immagini" #: ../src/preferences_dialog.c:338 msgid "Desktop" -msgstr "" +msgstr "Scrivania" #: ../src/preferences_dialog.c:460 msgid "Image Viewer Preferences" @@ -559,7 +554,6 @@ msgid "border width" msgstr "larghezza del bordo" #: ../src/thumbnail_bar.c:216 -#, fuzzy msgid "the border width of the thumbnail bar" msgstr "la larghezza del bordo della barra delle miniatur
