[Xfce4-commits] xfce4-mixer:master Fix typo in German translation
Updating branch refs/heads/master to 750822b39022f850c8618d7c0fde5636f7276a0b (commit) from 286e4a3568aff4f5775d7e0f6c9c1bcb4a6b7b02 (commit) commit 750822b39022f850c8618d7c0fde5636f7276a0b Author: Guido Berhoerster guido+x...@berhoerster.name Date: Thu Oct 4 08:47:38 2012 +0200 Fix typo in German translation po/de.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 1969a80..ca70c7b 100644 --- a/po/de.po +++ b/po/de.po @@ -115,7 +115,7 @@ msgstr Version anzeigen und Programm beenden #: ../xfce4-mixer/main.c:130 #, c-format msgid xfce4-mixer: Failed to initialize xfconf: %s\n -msgstr xfce4-mixer: Konnte xfconf nicht initialisieren: %s +msgstr xfce4-mixer: Konnte xfconf nicht initialisieren: %s\n #: ../xfce4-mixer/xfce-mixer-container.c:218 msgid _Playback ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/xfce-4.10 to 99e8cfc0b71864c02bc508c395c0b64e24cd3d8a (commit) from 4abc7195865050f98c61b535f2f6f3ad96a794d5 (commit) commit 99e8cfc0b71864c02bc508c395c0b64e24cd3d8a Author: محمد الحرقان malh...@gmail.com Date: Thu Oct 4 12:00:40 2012 +0200 l10n: Updated Arabic (ar) translation to 100% New status: 235 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 99 +++-- 1 files changed, 50 insertions(+), 49 deletions(-) diff --git a/po/ar.po b/po/ar.po index 302575b..4f17ac4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,37 +2,38 @@ # Arabic translations for xfwm4 package. # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the xfwm4 package. -# # Saleh Alhathal hathal...@hotmail.com, 2004. # Mohamed Magdy alno...@yahoo.com, 2006. # Mohamed SAAD محمد سعد mete...@free.fr, 2007. # Khaled Hosny khaledho...@eglug.org, 2007. # كريم أولاد الشلحة herr.linu...@gmail.com, 2012. +# محمد الحرقان malh...@gmail.com, 2012. msgid msgstr Project-Id-Version: xfwm4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-08-12 13:42+\n -PO-Revision-Date: 2011-01-10 23:47-\n -Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n -Language-Team: Arabic herr.linu...@gmail.org\n +POT-Creation-Date: 2012-10-04 09:39+\n +PO-Revision-Date: 2012-10-04 12:59+0300\n +Last-Translator: محمد الحرقان malh...@gmail.com\n +Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n; +Language: ar\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: ar\n -Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n=3 n=10 ? 2 : 3\n +Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 + n%100=10 ? 3 : n%100=11 ? 4 : 5;\n +X-Generator: Virtaal 0.7.1\n X-Poedit-Language: Arabic\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: Morocco\n -X-Generator: KBabel 1.11.4\n #: ../helper-dialog/helper-dialog.c:84 msgid This window might be busy and is not responding.\n Do you want to terminate the application? msgstr -يمكن أن هذه النافذة معطوبة و لا تستجيب.\n -هل تريد إنهاء هذا التطبيق? +قد تكون هذه النافذة معطوبة ولا تستجيب.\n +هل تريد إنهاء هذا التطبيق؟ #: ../helper-dialog/helper-dialog.c:89 msgid Warning @@ -134,11 +135,11 @@ msgstr bإخرا_ء الضغط المزدوج/b #: ../settings-dialogs/xfwm4-dialog.glade.h:4 msgid bFocus model/b -msgstr bنموذج البؤرة/b +msgstr bنموذج التركيز/b #: ../settings-dialogs/xfwm4-dialog.glade.h:5 msgid bNew window focus/b -msgstr bبؤرة نافذة جديدة/b +msgstr bتركيز نافذة جديدة/b #: ../settings-dialogs/xfwm4-dialog.glade.h:6 msgid bRaise on click/b @@ -204,15 +205,15 @@ msgstr مت_قدم #: ../settings-dialogs/xfwm4-dialog.glade.h:24 msgid Automatically _raise windows when they receive focus -msgstr _إرفع النوافذ تلقائيا عندما تتلقى البؤرة +msgstr إرفع النوافذ تلقائيا عندما تتلقى تركيز #: ../settings-dialogs/xfwm4-dialog.glade.h:25 msgid Automatically give focus to _newly created windows -msgstr اعطي البؤرة تلقائيا للنوافذ ال_منشأة حديثاً +msgstr تلقائيا ركز على النوافذ ال_منشأة حديثاً #: ../settings-dialogs/xfwm4-dialog.glade.h:26 msgid Clic_k to focus -msgstr ضغط لتركيز +msgstr اضغط للتركيز #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout @@ -224,15 +225,15 @@ msgstr اغلق #: ../settings-dialogs/xfwm4-dialog.glade.h:30 msgid Delay _before raising focused window: -msgstr التأخير قبل رفع النافذة ذات البؤرة : +msgstr التأخير قبل إزالة التركيز على النافذة: #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid Dis_tance: -msgstr الم_سافة : +msgstr الم_سافة: #: ../settings-dialogs/xfwm4-dialog.glade.h:32 msgid Focus follows _mouse -msgstr النركيز ي_تلي الفأرة +msgstr النركيز يتبع الفأرة #: ../settings-dialogs/xfwm4-dialog.glade.h:33 msgid Hidden @@ -272,11 +273,11 @@ msgstr ظلّل #: ../settings-dialogs/xfwm4-dialog.glade.h:42 msgid Snap windows to other _windows -msgstr إجذب النوافذ إلى النوافذ الأخرى +msgstr إجذب النوافذ إلى النوافذ الأخرى #: ../settings-dialogs/xfwm4-dialog.glade.h:43 msgid Snap windows to screen _border -msgstr إجذب النوافذ إلى حدود الشاشة +msgstr إجذب النوافذ إلى حدود الشاشة #: ../settings-dialogs/xfwm4-dialog.glade.h:44 msgid Stick @@ -284,7 +285,7 @@ msgstr ثبِّت #: ../settings-dialogs/xfwm4-dialog.glade.h:45 msgid The action to perform when the title-bar is double-clicked -msgstr الإجراء الذي سينفّذ عند النقر المزدوج على شريط العنوان : +msgstr الإجراء الذي سينفّذ عند النقر المزدوج على شريط العنوان #: ../settings-dialogs/xfwm4-dialog.glade.h:46 msgid The window title cannot be removed @@ -304,24 +305,24 @@ msgstr صفِّف مساحات العمل عند سحب نافذة خارج ح #: ../settings-dialogs/xfwm4-dialog.glade.h:51 msgid _Delay before window
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Update glade-file and icons for minimal dialog
Updating branch refs/heads/bluesabre/display-settings to 18f5b2b24eff4818353eb0577e8c4b5695d0ddd1 (commit) from d8328e75cb8a86109824612b7760ac58e4405000 (commit) commit 18f5b2b24eff4818353eb0577e8c4b5695d0ddd1 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Oct 4 11:16:41 2012 +0200 Update glade-file and icons for minimal dialog dialogs/display-settings/display1.png | Bin 0 - 7527 bytes dialogs/display-settings/display2.png | Bin 0 - 7654 bytes dialogs/display-settings/extend-left.png | Bin 5867 - 0 bytes .../display-settings/minimal-display-dialog.glade | 71 +--- 4 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dialogs/display-settings/display1.png b/dialogs/display-settings/display1.png new file mode 100644 index 000..793022f Binary files /dev/null and b/dialogs/display-settings/display1.png differ diff --git a/dialogs/display-settings/display2.png b/dialogs/display-settings/display2.png new file mode 100644 index 000..64bbd39 Binary files /dev/null and b/dialogs/display-settings/display2.png differ diff --git a/dialogs/display-settings/extend-left.png b/dialogs/display-settings/extend-left.png deleted file mode 100644 index 5e0dbd5..000 Binary files a/dialogs/display-settings/extend-left.png and /dev/null differ diff --git a/dialogs/display-settings/minimal-display-dialog.glade b/dialogs/display-settings/minimal-display-dialog.glade index b5cb4b1..6e6b1d9 100644 --- a/dialogs/display-settings/minimal-display-dialog.glade +++ b/dialogs/display-settings/minimal-display-dialog.glade @@ -13,18 +13,18 @@ object class=GtkVBox id=vbox1 property name=visibleTrue/property property name=can_focusFalse/property -property name=border_width12/property -property name=spacing12/property +property name=border_width6/property +property name=spacing6/property child object class=GtkTable id=table1 property name=visibleTrue/property property name=can_focusFalse/property property name=n_rows2/property -property name=n_columns3/property -property name=column_spacing48/property +property name=n_columns4/property +property name=column_spacing24/property property name=row_spacing3/property child - object class=GtkToggleButton id=extend_left + object class=GtkToggleButton id=display1 property name=width_request128/property property name=height_request128/property property name=visibleTrue/property @@ -35,7 +35,7 @@ object class=GtkImage id=image1 property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufextend-left.png/property +property name=pixbufdisplay1.png/property /object /child /object @@ -94,7 +94,7 @@ object class=GtkLabel id=label1 property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesExtend to the left/property +property name=label translatable=yesOnly Display 1/property /object packing property name=top_attach1/property @@ -133,6 +133,44 @@ property name=y_optionsGTK_FILL/property /packing /child +child + object class=GtkToggleButton id=display2 +property name=width_request128/property +property name=height_request128/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +child + object class=GtkImage id=image4 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufdisplay2.png/property + /object +/child + /object + packing +property name=left_attach3/property +property name=right_attach4/property +property name=x_optionsGTK_FILL/property +property name=y_optionsGTK_FILL/property + /packing +/child +child + object class=GtkLabel id=label4 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesOnly Display 2/property + /object +
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Hook up the reworked minimal dialog
Updating branch refs/heads/bluesabre/display-settings
to 81894832f619b5bae3f9199a045ae4f9e2934f96 (commit)
from 18f5b2b24eff4818353eb0577e8c4b5695d0ddd1 (commit)
commit 81894832f619b5bae3f9199a045ae4f9e2934f96
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Oct 4 12:24:11 2012 +0200
Hook up the reworked minimal dialog
dialogs/display-settings/main.c | 288 ---
1 files changed, 179 insertions(+), 109 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0640404..c22ffea 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -113,7 +113,7 @@ static gboolean bound_to_channel = FALSE;
XfceRandr *xfce_randr = NULL;
static void
-display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
GtkBuilder *builder);
static void
@@ -123,7 +123,10 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
static void
display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
GtkBuilder *builder);
-
+
+static void
+display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
+ GtkBuilder *builder);
static guint
@@ -1363,134 +1366,193 @@ display_settings_dialog_new (GtkBuilder *builder)
}
static void
-display_settings_minimal_extend_left_toggled (GtkToggleButton *button,
+display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
GtkBuilder *builder)
{
-GObject *mirror_displays;
-GObject *extend_right;
-
-gint selected_x, selected_y;
-XfceRRMode *current_mode;
+GObject *mirror_displays, *extend_right, *only_display2;
mirror_displays = gtk_builder_get_object(builder, mirror);
extend_right = gtk_builder_get_object(builder, extend_right);
-
+only_display2 = gtk_builder_get_object(builder, display2);
+
+/* Lock everything in the dialog to prevent bad things from happening */
g_object_disconnect (mirror_displays, any_signal::toggled,
display_settings_minimal_mirror_displays_toggled,
builder, NULL);
-
g_object_disconnect (extend_right, any_signal::toggled,
display_settings_minimal_extend_right_toggled,
builder, NULL);
+g_object_disconnect (only_display2, any_signal::toggled,
+ display_settings_minimal_only_display2_toggled,
+ builder, NULL);
gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), FALSE );
gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
-
-/* Since this signal will only be called when a toggle button is
activated. */
+gtk_widget_set_sensitive( GTK_WIDGET(only_display2), FALSE );
+
gtk_toggle_button_set_active (button, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(only_display2), FALSE);
-/* Change active output to secondary display. */
-xfce_randr-active_output = 1;
-
-current_mode = xfce_randr_find_mode_by_id (xfce_randr,
xfce_randr-active_output, XFCE_RANDR_MODE (xfce_randr));
-
-/* Change active output to primary display. */
-xfce_randr-active_output = 0;
+if (!xfce_randr)
+return;
+
+if (xfce_randr-noutput = 1)
+return;
+
+if (gtk_toggle_button_get_active (button))
+{
+ /* Put Display1 in its preferred mode and deactivate Display2 */
+XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr,
0);
+xfce_randr-active_output = 1;
+XFCE_RANDR_MODE (xfce_randr) = None;
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,0);
+xfce_randr_save_output (xfce_randr, Default, display_channel,1);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+}
-/* Move the secondary to where the primary is... */
-selected_x = XFCE_RANDR_POS_X (xfce_randr);
-selected_y = XFCE_RANDR_POS_Y (xfce_randr);
-xfce_randr-active_output = 1;
-XFCE_RANDR_POS_X (xfce_randr) = selected_x;
-XFCE_RANDR_POS_Y (xfce_randr) = selected_y;
+gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), TRUE );
+gtk_widget_set_sensitive( GTK_WIDGET(extend_right), TRUE );
+gtk_widget_set_sensitive( GTK_WIDGET(only_display2), TRUE );
+
+/* Reconnect the
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Rename Rotation from Normal to None (consistency with Reflection)
Updating branch refs/heads/bluesabre/display-settings
to 131356b9b8cd8d1360624e06e887386d21aed299 (commit)
from 81894832f619b5bae3f9199a045ae4f9e2934f96 (commit)
commit 131356b9b8cd8d1360624e06e887386d21aed299
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Oct 4 12:27:03 2012 +0200
Rename Rotation from Normal to None (consistency with Reflection)
dialogs/display-settings/main.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index c22ffea..e57ba21 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -65,7 +65,7 @@ enum
/* Xrandr rotation name conversion */
static const XfceRotation rotation_names[] =
{
-{ RR_Rotate_0, N_(Normal) },
+{ RR_Rotate_0, N_(None) },
{ RR_Rotate_90, N_(Left) },
{ RR_Rotate_180, N_(Inverted) },
{ RR_Rotate_270, N_(Right) }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Use g_utf8_collate_key_for_filename for sorting (bug #7110).
Updating branch refs/heads/master
to 1fcb0e71632b9ed21e5f51c022687605fa4b4537 (commit)
from a877a2a50e64750f3118246f272bf17fb34de2cf (commit)
commit 1fcb0e71632b9ed21e5f51c022687605fa4b4537
Author: Andrzej ndrwr...@gmail.com
Date: Thu Oct 4 18:27:23 2012 +0200
Use g_utf8_collate_key_for_filename for sorting (bug #7110).
This should resolve issue with non-ascii locales and it
respects the LC_COLLATE setting of the user.
thunar/thunar-file.c | 281 --
thunar/thunar-file.h |2 +-
2 files changed, 44 insertions(+), 239 deletions(-)
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index dfd2977..68df146 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -155,6 +155,8 @@ struct _ThunarFile
GFile *gfile;
gchar *custom_icon_name;
gchar *display_name;
+ gchar *collate_key;
+ gchar *collate_key_nocase;
gchar *basename;
gchar *thumbnail_path;
guint flags;
@@ -331,6 +333,11 @@ thunar_file_finalize (GObject *object)
g_free (file-display_name);
g_free (file-basename);
+ /* free collate keys */
+ if (file-collate_key_nocase != file-collate_key)
+g_free (file-collate_key_nocase);
+ g_free (file-collate_key);
+
/* free the thumbnail path */
g_free (file-thumbnail_path);
@@ -652,10 +659,6 @@ thunar_file_get (GFile *gfile,
/* allocate a new object */
file = g_object_new (THUNAR_TYPE_FILE, NULL);
file-gfile = g_object_ref (gfile);
- file-info = NULL;
- file-custom_icon_name = NULL;
- file-display_name = NULL;
- file-basename = NULL;
if (thunar_file_load (file, NULL, error))
{
@@ -740,6 +743,7 @@ thunar_file_load (ThunarFile *file,
gchar *thumbnail_dir_path;
const gchar *display_name;
gboolean is_secure = FALSE;
+ gchar *casefold;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -763,6 +767,14 @@ thunar_file_load (ThunarFile *file,
g_free (file-basename);
file-basename = NULL;
+ /* free collate keys */
+ if (file-collate_key_nocase != file-collate_key)
+g_free (file-collate_key_nocase);
+ file-collate_key_nocase = NULL;
+
+ g_free (file-collate_key);
+ file-collate_key = NULL;
+
/* free thumbnail path */
g_free (file-thumbnail_path);
file-thumbnail_path = NULL;
@@ -921,6 +933,21 @@ thunar_file_load (ThunarFile *file,
}
}
+ /* create case sensitive collation key */
+ file-collate_key = g_utf8_collate_key_for_filename (file-display_name, -1);
+
+ /* lowercase the display name */
+ casefold = g_utf8_casefold (file-display_name, -1);
+
+ /* if the lowercase name is equal, only peek the already hash key */
+ if (casefold != NULL strcmp (casefold, file-display_name) != 0)
+file-collate_key_nocase = g_utf8_collate_key_for_filename (casefold, -1);
+ else
+file-collate_key_nocase = file-collate_key;
+
+ /* cleanup */
+ g_free (casefold);
+
/* set thumb state to unknown */
file-flags =
(file-flags ~THUNAR_FILE_THUMB_STATE_MASK) |
THUNAR_FILE_THUMB_STATE_UNKNOWN;
@@ -3250,100 +3277,6 @@ thunar_file_destroy (ThunarFile *file)
-static guint
-skip_leading_zeros (const gchar **ap,
-const gchar *name)
-{
- const gchar *bp;
- guintskipped_zeros = 0;
-
- /* do a backward search to check if the number starts with a '0' */
- for (bp = *ap; bp = name; --bp)
-{
- if (*bp != '0')
-break;
-}
-
- /* if the number starts with a '0' skip all following '0' */
- if (!g_ascii_isdigit (*bp) || *bp == '0')
- {
- for (bp = *ap; *bp != '\0'; ++bp)
- {
- if (*bp != '0')
- break;
- }
-
- skipped_zeros = bp - *ap;
- *ap = bp;
- return skipped_zeros;
- }
-
- return 0;
-}
-
-
-
-static gint
-compare_by_name_using_number (const gchar *ap,
- const gchar *bp,
- const gchar *start_a,
- const gchar *start_b)
-{
- const gchar *ai;
- const gchar *bi;
- gcharac;
- gcharbc;
- guintskipped_zeros_a;
- guintskipped_zeros_b;
-
- /* up until now the numbers match. Now compare the numbers by digit
- * count, the longest number is the largest. If the lengths are equal
- * compare the digits. */
-
- /* skip leading zeros of both numbers */
- skipped_zeros_a = skip_leading_zeros (ap, start_a);
- skipped_zeros_b = skip_leading_zeros (bp, start_b);
-
- /* determine the largest number */
- for (ai = ap, bi = bp;; ++ai, ++bi)
-{
- ac = *ai;
- bc = *bi;
- if (!g_ascii_isdigit (ac) || !g_ascii_isdigit (bc))
-break;
-}
-
- /* if one of the numbers still has a digit, that number is the largest. */
- if (g_ascii_isdigit (ac))
-return 1;
-
[Xfce4-commits] thunar:andrzejr/utf8_collate Deleting branch andrzejr/utf8_collate
Deleting branch refs/heads/andrzejr/utf8_collate ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Super simplification of minimal dialog and code.
Updating branch refs/heads/bluesabre/display-settings
to 422122c9d6236b4bf7010fbcd78eea35f3b823e5 (commit)
from 131356b9b8cd8d1360624e06e887386d21aed299 (commit)
commit 422122c9d6236b4bf7010fbcd78eea35f3b823e5
Author: Sean Davis smd.seanda...@gmail.com
Date: Thu Oct 4 14:03:25 2012 -0400
Super simplification of minimal dialog and code.
dialogs/display-settings/main.c| 225 ++--
.../display-settings/minimal-display-dialog.glade | 161 ---
2 files changed, 147 insertions(+), 239 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index e57ba21..03ebbc5 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1367,158 +1367,86 @@ display_settings_dialog_new (GtkBuilder *builder)
static void
display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
- GtkBuilder *builder)
+GtkBuilder *builder)
{
-GObject *mirror_displays, *extend_right, *only_display2;
+GObject *buttons;
-mirror_displays = gtk_builder_get_object(builder, mirror);
-extend_right = gtk_builder_get_object(builder, extend_right);
-only_display2 = gtk_builder_get_object(builder, display2);
-
-/* Lock everything in the dialog to prevent bad things from happening */
-g_object_disconnect (mirror_displays, any_signal::toggled,
- display_settings_minimal_mirror_displays_toggled,
- builder, NULL);
-g_object_disconnect (extend_right, any_signal::toggled,
- display_settings_minimal_extend_right_toggled,
- builder, NULL);
-g_object_disconnect (only_display2, any_signal::toggled,
- display_settings_minimal_only_display2_toggled,
- builder, NULL);
-
-gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), FALSE );
-gtk_widget_set_sensitive( GTK_WIDGET(extend_right), FALSE );
-gtk_widget_set_sensitive( GTK_WIDGET(only_display2), FALSE );
-
-gtk_toggle_button_set_active (button, TRUE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mirror_displays), FALSE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(extend_right), FALSE);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(only_display2), FALSE);
+if ( !gtk_toggle_button_get_active(button) )
+return;
if (!xfce_randr)
return;
if (xfce_randr-noutput = 1)
return;
+
+buttons = gtk_builder_get_object(builder, buttons);
+gtk_widget_set_sensitive( GTK_WIDGET(buttons), FALSE );
-if (gtk_toggle_button_get_active (button))
-{
- /* Put Display1 in its preferred mode and deactivate Display2 */
-XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr,
0);
-xfce_randr-active_output = 1;
-XFCE_RANDR_MODE (xfce_randr) = None;
-/* Apply the changes */
-xfce_randr_save_output (xfce_randr, Default, display_channel,0);
-xfce_randr_save_output (xfce_randr, Default, display_channel,1);
-xfce_randr_apply (xfce_randr, Default, display_channel);
-}
+ /* Put Display1 in its preferred mode and deactivate Display2 */
+XFCE_RANDR_MODE (xfce_randr) = xfce_randr_preferred_mode (xfce_randr, 0);
+xfce_randr-active_output = 1;
+XFCE_RANDR_MODE (xfce_randr) = None;
-gtk_widget_set_sensitive( GTK_WIDGET(mirror_displays), TRUE );
-gtk_widget_set_sensitive( GTK_WIDGET(extend_right), TRUE );
-gtk_widget_set_sensitive( GTK_WIDGET(only_display2), TRUE );
-
-/* Reconnect the signals */
-g_signal_connect (mirror_displays, toggled, G_CALLBACK
(display_settings_minimal_mirror_displays_toggled),
- builder);
-g_signal_connect (extend_right, toggled, G_CALLBACK
(display_settings_minimal_extend_right_toggled),
- builder);
-g_signal_connect (only_display2, toggled, G_CALLBACK
(display_settings_minimal_only_display2_toggled),
- builder);
+/* Apply the changes */
+xfce_randr_save_output (xfce_randr, Default, display_channel,0);
+xfce_randr_save_output (xfce_randr, Default, display_channel,1);
+xfce_randr_apply (xfce_randr, Default, display_channel);
+
+gtk_widget_set_sensitive( GTK_WIDGET(buttons), TRUE );
}
static void
display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
- GtkBuilder *builder)
+GtkBuilder *builder)
{
-GObject *mirror_displays, *extend_right, *only_display1;
+GObject *buttons;
-mirror_displays = gtk_builder_get_object(builder, mirror);
-extend_right = gtk_builder_get_object(builder, extend_right);
-
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Connected Advanced button in minimal dialog.
Updating branch refs/heads/bluesabre/display-settings
to a4317a8b9994bc6d52392d4ac743009eb38e0f5c (commit)
from 422122c9d6236b4bf7010fbcd78eea35f3b823e5 (commit)
commit a4317a8b9994bc6d52392d4ac743009eb38e0f5c
Author: Sean Davis smd.seanda...@gmail.com
Date: Thu Oct 4 15:55:34 2012 -0400
Connected Advanced button in minimal dialog.
dialogs/display-settings/main.c | 257 ---
1 files changed, 156 insertions(+), 101 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 03ebbc5..3b4edb1 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -60,6 +60,13 @@ enum
N_COMBO_COLUMNS
};
+typedef struct {
+GtkBuilder *builder;
+GdkDisplay *display;
+gint event_base;
+GError *error;
+} minimal_advanced_context;
+
/* Xrandr rotation name conversion */
@@ -1556,15 +1563,158 @@ screen_on_event (GdkXEvent *xevent,
return GDK_FILTER_CONTINUE;
}
+static void
+display_settings_show_main_dialog (GdkDisplay *display,
+ gint event_base,
+ GError *error)
+{
+GtkBuilder *builder;
+GtkWidget *dialog;
+
+GtkWidget *plug;
+GObject *plug_child;
+
+/* Load the Gtk user-interface file */
+builder = gtk_builder_new ();
+if (gtk_builder_add_from_string (builder, display_dialog_ui,
+ display_dialog_ui_length, error) != 0)
+{
+/* Build the dialog */
+dialog = display_settings_dialog_new (builder);
+XFCE_RANDR_EVENT_BASE (xfce_randr) = event_base;
+/* Set up notifications */
+XRRSelectInput (gdk_x11_display_get_xdisplay (display),
+GDK_WINDOW_XID (gdk_get_default_root_window ()),
+RRScreenChangeNotifyMask);
+gdk_x11_register_standard_event_type (display,
+ event_base,
+ RRNotify + 1);
+gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+if (G_UNLIKELY (opt_socket_id == 0))
+{
+g_signal_connect (G_OBJECT (dialog), response,
+G_CALLBACK (display_settings_dialog_response), builder);
+
+/* Show the dialog */
+gtk_window_present (GTK_WINDOW (dialog));
+}
+else
+{
+/* Create plug widget */
+plug = gtk_plug_new (opt_socket_id);
+g_signal_connect (plug, delete-event, G_CALLBACK
(gtk_main_quit), NULL);
+gtk_widget_show (plug);
+
+/* Get plug child widget */
+plug_child = gtk_builder_get_object (builder, plug-child);
+gtk_widget_reparent (GTK_WIDGET (plug_child), plug);
+gtk_widget_show (GTK_WIDGET (plug_child));
+}
+
+/* To prevent the settings dialog to be saved in the session */
+gdk_set_sm_client_id (FAKE ID);
+
+/* Enter the main loop */
+gtk_main ();
+
+gtk_widget_destroy (dialog);
+}
+else
+{
+g_error (Failed to load the UI file: %s., error-message);
+g_error_free (error);
+}
+
+gdk_window_remove_filter (gdk_get_default_root_window (), screen_on_event,
builder);
+
+/* Release the builder */
+g_object_unref (G_OBJECT (builder));
+}
+
+static void
+display_settings_minimal_advanced_clicked(GtkButton *button,
+ minimal_advanced_context *context)
+{
+GtkWidget *dialog;
+
+dialog = (GtkWidget *) gtk_builder_get_object (context-builder, dialog);
+gtk_widget_hide( dialog );
+
+display_settings_show_main_dialog( context-display, context-event_base,
context-error );
+
+gtk_main_quit();
+}
+
+static void
+display_settings_show_minimal_dialog (GdkDisplay *display,
+ gint event_base,
+ GError *error)
+{
+GtkBuilder *builder;
+GtkWidget *dialog, *cancel;
+
+builder = gtk_builder_new ();
+
+if (gtk_builder_add_from_string (builder, minimal_display_dialog_ui,
+ minimal_display_dialog_ui_length, error)
!= 0)
+{
+GObject *only_display1;
+GObject *only_display2;
+GObject *mirror_displays;
+GObject *extend_right;
+GObject *advanced;
+minimal_advanced_context context;
+
+context.builder = builder;
+context.display = display;
+context.event_base = event_base;
+context.error = error;
+
+/* Build the minimal dialog */
+dialog = (GtkWidget *) gtk_builder_get_object (builder, dialog);
+cancel = (GtkWidget *) gtk_builder_get_object (builder,
cancel_button);
+
+g_signal_connect (dialog, delete-event, G_CALLBACK
[Xfce4-commits] xfce4-panel:master l10n: Updated Polish (pl) translation to 96%
Updating branch refs/heads/master to 3289b3b6f4bdce4947ababddeab2386b785c7a84 (commit) from 2bee3ff002f7aedecffcf17b14b2302e7c043505 (commit) commit 3289b3b6f4bdce4947ababddeab2386b785c7a84 Author: Marcin Romańczuk abj...@gmail.com Date: Thu Oct 4 22:34:12 2012 +0200 l10n: Updated Polish (pl) translation to 96% New status: 374 messages complete with 0 fuzzies and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pl.po b/po/pl.po index a0b075c..b9f3f2c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -12,7 +12,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.9.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-09-24 17:21+\n +POT-Creation-Date: 2012-10-04 18:06+\n PO-Revision-Date: 2012-04-15 12:05+0200\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: polski \n @@ -1135,7 +1135,7 @@ msgstr Późny wieczór #: ../plugins/clock/clock-fuzzy.c:100 #, no-c-format msgid %0 o'clock -msgstr punktualnie %0 +msgstr godzina %0 #: ../plugins/clock/clock-fuzzy.c:101 #, no-c-format @@ -1150,7 +1150,7 @@ msgstr dziesięć po %0 #: ../plugins/clock/clock-fuzzy.c:103 #, no-c-format msgid quarter past %0 -msgstr piętnaście po %0 +msgstr kwadrans po %0 #: ../plugins/clock/clock-fuzzy.c:104 #, no-c-format @@ -1165,7 +1165,7 @@ msgstr dwadzieścia pięć po %0 #: ../plugins/clock/clock-fuzzy.c:106 #, no-c-format msgid half past %0 -msgstr wpół do %0 +msgstr pół godziny po %0 #: ../plugins/clock/clock-fuzzy.c:107 #, no-c-format @@ -1180,7 +1180,7 @@ msgstr za dwadzieścia %1 #: ../plugins/clock/clock-fuzzy.c:109 #, no-c-format msgid quarter to %1 -msgstr za piętnaście %1 +msgstr za kwadrans %1 #: ../plugins/clock/clock-fuzzy.c:110 #, no-c-format @@ -1195,7 +1195,7 @@ msgstr za pięć %1 #: ../plugins/clock/clock-fuzzy.c:112 #, no-c-format msgid %1 o'clock -msgstr punktualnie 1 +msgstr godzina %1 #. I18N: some languages have a singular form for the first hour, #. * other languages should just use the same strings as above ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/master to eb85045030f7adc2bada1e989ece718a3a883533 (commit) from 4c4efe90497763eb8fff29a659f57cfb163df0ff (commit) commit eb85045030f7adc2bada1e989ece718a3a883533 Author: محمد الحرقان malh...@gmail.com Date: Thu Oct 4 22:57:47 2012 +0200 l10n: Updated Arabic (ar) translation to 100% New status: 336 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 143 ++--- 1 files changed, 70 insertions(+), 73 deletions(-) diff --git a/po/ar.po b/po/ar.po index c14164f..4593566 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # mohammad malh...@gmail.com, 2012. # كريم أولاد الشلحة herr.linu...@gmail.com, 2012. +# محمد الحرقان malh...@gmail.com, 2012. msgid msgstr Project-Id-Version: Xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-22 11:18+\n -PO-Revision-Date: 2012-05-22 19:26+0300\n -Last-Translator: mohammad malh...@gmail.com\n +POT-Creation-Date: 2012-10-04 18:45+\n +PO-Revision-Date: 2012-10-04 23:57+0300\n +Last-Translator: محمد الحرقان malh...@gmail.com\n Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n; Language: ar\n MIME-Version: 1.0\n @@ -249,7 +250,7 @@ msgstr معلومات النسخة #: ../dialogs/display-settings/main.c:1043 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60 +#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 #, c-format msgid Type '%s --help' for usage. msgstr أكتب '%s --help' لإستعمال. @@ -259,7 +260,7 @@ msgstr أكتب '%s --help' لإستعمال. #: ../dialogs/display-settings/main.c:1062 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76 +#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 msgid The Xfce development team. All rights reserved. msgstr فريق تطوير إكسفس. كل الحقوق محفوظة. @@ -268,7 +269,7 @@ msgstr فريق تطوير إكسفس. كل الحقوق محفوظة. #: ../dialogs/display-settings/main.c:1063 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77 +#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 #, c-format msgid Please report bugs to %s. msgstr الرجاء الإبلاغ عن الخلل في %s. @@ -745,62 +746,82 @@ msgstr سلوك msgid Blink _delay: msgstr مهلة الوميض: +# Automatically copied. Please review and remove fuzzy flag. #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4 +msgid Change layout option +msgstr تغيير خيارات التخطيط + +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +msgid Compose key +msgstr إعداد موقع المفتاح + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 msgid Cursor msgstr المؤشر -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 msgid Define _shortcuts for launching applications: msgstr تعريف إختصارات بدء التطبيقات: -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1 msgid Edit keyboard settings and application shortcuts msgstr تحرير إعدادات لوحة المفاتيح واختصارات التطبيقات -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16 msgid General msgstr عام -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2 msgid Keyboard msgstr لوحة المفاتيح -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 msgid Keyboard layout msgstr مبدّل تخطيط لوحة المفاتيح -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid Keyboard layout selection msgstr محدد مبدّل تخطيط لوحة المفاتيح -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid Keyboard model msgstr نموذج لوحة المفاتيح -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +msgid
[Xfce4-commits] exo:master l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/master to 3ef4f210621c56c0ddeeab809a8fe8025c81e1ed (commit) from 9c5d44de644c9abbfea06689495eb97c5eac82a4 (commit) commit 3ef4f210621c56c0ddeeab809a8fe8025c81e1ed Author: محمد الحرقان malh...@gmail.com Date: Thu Oct 4 23:25:09 2012 +0200 l10n: Updated Arabic (ar) translation to 100% New status: 275 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 177 - 1 files changed, 93 insertions(+), 84 deletions(-) diff --git a/po/ar.po b/po/ar.po index 45108c7..d236db2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,21 +1,23 @@ # كريم أولاد الشلحة herr.linu...@gmail.com, 2012. +# محمد الحرقان malh...@gmail.com, 2012. msgid msgstr Project-Id-Version: libexo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-01 16:42+\n -PO-Revision-Date: 2012-02-20 21:17+\n -Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n -Language-Team: Arabic Xfce Translation Team\n +POT-Creation-Date: 2012-10-04 20:27+\n +PO-Revision-Date: 2012-10-05 00:23+0300\n +Last-Translator: محمد الحرقان malh...@gmail.com\n +Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n; +Language: ar\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: ar\n -Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 n%100=10 ? 3 : n%100=11 ? 4 : 5;\n +Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 + n%100=10 ? 3 : n%100=11 ? 4 : 5;\n +X-Generator: Virtaal 0.7.1\n X-Poedit-Language: Arabic\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: MOROCCO\n -X-Generator: Virtaal 0.7.0\n #: ../exo/exo-cell-renderer-ellipsized-text.c:131 #: ../exo/exo-cell-renderer-icon.c:144 @@ -25,7 +27,7 @@ msgstr الحالة التالية #: ../exo/exo-cell-renderer-ellipsized-text.c:132 #: ../exo/exo-cell-renderer-icon.c:145 msgid Render differently based on the selection state. -msgstr +msgstr التقديم بشكل مختلف استناداً إلى حالة التحديد. #: ../exo/exo-cell-renderer-icon.c:166 msgid Icon @@ -33,7 +35,7 @@ msgstr أيقونة #: ../exo/exo-cell-renderer-icon.c:167 msgid The icon to render. -msgstr +msgstr رمز لتقديم. #: ../exo/exo-cell-renderer-icon.c:185 msgid GIcon @@ -41,7 +43,7 @@ msgstr أيقونة #: ../exo/exo-cell-renderer-icon.c:186 msgid The GIcon to render. -msgstr +msgstr أيقونةGIcon لتقديمها. #: ../exo/exo-cell-renderer-icon.c:207 msgid size @@ -49,7 +51,7 @@ msgstr حجم #: ../exo/exo-cell-renderer-icon.c:208 msgid The size of the icon to render in pixels. -msgstr +msgstr حجم الرمز التقديم بالبكسل. #: ../exo/exo-gdk-pixbuf-extensions.c:787 #, c-format @@ -86,7 +88,7 @@ msgstr Pixbuf عمود #: ../exo/exo-icon-bar.c:295 ../exo/exo-icon-view.c:794 msgid Model column used to retrieve the icon pixbuf from -msgstr +msgstr عمود النموذج المستخدم لاسترداد رمز pixbuf من #: ../exo/exo-icon-bar.c:310 ../exo/exo-icon-view.c:920 msgid Text column @@ -94,7 +96,7 @@ msgstr عمود نص #: ../exo/exo-icon-bar.c:311 ../exo/exo-icon-view.c:921 msgid Model column used to retrieve the text from -msgstr +msgstr عمود النموذج المستخدم لاسترداد النص من #: ../exo/exo-icon-bar.c:323 msgid Icon Bar Model @@ -327,7 +329,7 @@ msgstr نقرة واحدة #: ../exo/exo-icon-view.c:872 ../exo/exo-tree-view.c:155 msgid Whether the items in the view can be activated with single clicks -msgstr +msgstr إذا كان يمكن تنشيط العناصر الموجودة في العرض بنقرة مفردة #: ../exo/exo-icon-view.c:888 ../exo/exo-tree-view.c:171 msgid Single Click Timeout @@ -338,6 +340,7 @@ msgid The amount of time after which the item under the mouse cursor will be selected automatically in single click mode msgstr +مقدار وقت المرور تحت مؤشر الفأرة لتحديد العنصر تلقائياً في وضع نقرة واحدة #: ../exo/exo-icon-view.c:904 msgid Spacing @@ -393,13 +396,15 @@ msgstr مقبس #: ../exo/exo-toolbars-editor-dialog.c:118 msgid _Add a new toolbar -msgstr أ_ضِف شريط أدوات جديد +msgstr _أضِف شريط أدوات جديد #: ../exo/exo-toolbars-editor.c:221 msgid Drag an item onto the toolbars above to add it, from the toolbars in the items table to remove it. msgstr +اسحب عنصر إلى أشرطة الأدوات المذكورة أعلاه لإضافته ومن أشرطة الأدوات في جدول +العناصر لإزالته. #: ../exo/exo-toolbars-editor.c:538 msgid Separator @@ -407,19 +412,19 @@ msgstr فاصل #: ../exo/exo-toolbars-view.c:752 msgid Toolbar _Style -msgstr _شكل شريط الأدوات +msgstr شكل شريط الأدوات #: ../exo/exo-toolbars-view.c:759 msgid _Desktop Default -msgstr س_طح المكتب الإفتراضي +msgstr _سطح المكتب الإفتراضي #: ../exo/exo-toolbars-view.c:768 msgid _Icons only -msgstr أ_يقونات فقط +msgstr _أيقونات فقط #: ../exo/exo-toolbars-view.c:777 msgid _Text only -msgstr ن_ص فقط +msgstr _نص فقط #: ../exo/exo-toolbars-view.c:786 msgid Text for _All Icons @@ -431,11 +436,11 @@ msgstr نص لأ_يقونات الهامة #:
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/master to 8e2749302cec74405dae7ebbef744790f3ae380c (commit) from 1e4edbf86e47e92f4dcfc6706d09a784e667ed63 (commit) commit 8e2749302cec74405dae7ebbef744790f3ae380c Author: محمد الحرقان malh...@gmail.com Date: Thu Oct 4 23:34:14 2012 +0200 l10n: Updated Arabic (ar) translation to 100% New status: 68 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 150 +++-- 1 files changed, 86 insertions(+), 64 deletions(-) diff --git a/po/ar.po b/po/ar.po index f5c600f..1c19e3f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,18 +1,21 @@ # Arabeyes Translation Documentation Team http://arabeyes.org # Hakeem Dimashq 2007. -# +# محمد الحرقان malh...@gmail.com, 2012. msgid msgstr Project-Id-Version: xfce4-appfinder\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-12-29 19:42+\n -PO-Revision-Date: 2011-09-25 23:18-\n -Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n -Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n +POT-Creation-Date: 2012-10-04 16:51+\n +PO-Revision-Date: 2012-10-05 00:33+0300\n +Last-Translator: محمد الحرقان malh...@gmail.com\n +Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n; +Language: ar\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n +Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 + n%100=10 ? 3 : n%100=11 ? 4 : 5;\n +X-Generator: Virtaal 0.7.1\n X-Poedit-Language: Arabic\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: Morocco\n @@ -21,101 +24,107 @@ msgstr msgid All Applications msgstr كل التطبيقات -#: ../src/appfinder-model.c:540 +#: ../src/appfinder-model.c:545 msgid Name msgstr إسم -#: ../src/appfinder-model.c:541 +#: ../src/appfinder-model.c:546 msgid Comment msgstr تعليق -#: ../src/appfinder-model.c:542 +#: ../src/appfinder-model.c:547 msgid Command msgstr أمر -#: ../src/appfinder-model.c:543 +#: ../src/appfinder-model.c:548 msgid Categories msgstr أصناف -#: ../src/appfinder-model.c:544 +#: ../src/appfinder-model.c:549 msgid Filename msgstr إسم الملف -#: ../src/appfinder-model.c:1820 +#: ../src/appfinder-model.c:1829 msgid Application has no command msgstr التطبيق لا يتوفر على أمر -#: ../src/appfinder-model.c:2137 +#: ../src/appfinder-model.c:2153 msgid Commands History msgstr تاريخ الاوامر -#: ../src/appfinder-preferences.c:210 +#: ../src/appfinder-preferences.c:219 msgid C_lear msgstr مح_و -#: ../src/appfinder-preferences.c:211 +#: ../src/appfinder-preferences.c:220 msgid This will permanently clear the custom command history. msgstr هذا سوف يمحو نهائيا تاريخ الأوامر المخصصة. -#: ../src/appfinder-preferences.c:212 +#: ../src/appfinder-preferences.c:221 msgid Are you sure you want to clear the command history? -msgstr هل أنت متأكد من أنك تريد محو تاريخ الاوامر؟ +msgstr هل أنت متأكد أنك تريد محو تاريخ الاوامر؟ -#: ../src/appfinder-preferences.c:322 +#: ../src/appfinder-preferences.c:331 msgid The custom action will be deleted permanently. msgstr سيتم حذف نهائيا الإجراء المخصص. -#: ../src/appfinder-preferences.c:323 +#: ../src/appfinder-preferences.c:332 #, c-format msgid Are you sure you want to delete pattern \%s\? -msgstr هل أنت متأكد من أنك تريد حذف القالب \%s\? +msgstr هل أنت متأكد أنك تريد حذف القالب \%s\؟ -#: ../src/appfinder-window.c:216 ../src/main.c:429 +#: ../src/appfinder-window.c:219 ../src/main.c:446 #: ../src/appfinder-preferences.glade.h:4 #: ../data/xfce4-appfinder.desktop.in.h:1 msgid Application Finder msgstr مكتشف التطبيقات -#: ../src/appfinder-window.c:267 +#: ../src/appfinder-window.c:286 msgid Toggle view mode msgstr تبديل لوضع العرض -#: ../src/appfinder-window.c:762 +#: ../src/appfinder-window.c:391 +msgid La_unch +msgstr إطلاق + +#: ../src/appfinder-window.c:826 msgid Failed to launch desktop item editor msgstr فشل إطلاق محرر عنصر سطح المكتب -#: ../src/appfinder-window.c:788 +#: ../src/appfinder-window.c:852 msgid This will permanently remove the custom desktop file from your home directory. -msgstr هذا سيحذف نهائيا ملف سطح المكتب المخصص من دليل المنزل؟ +msgstr هذا سيحذف ملف سطح المكتب المخصص من مجلد المنزل نهائيا. -#: ../src/appfinder-window.c:789 +#: ../src/appfinder-window.c:853 #, c-format msgid Are you sure you want to revert \%s\? -msgstr هل أنت متاكد من أنك تريد إرجاع \%s\? +msgstr هل أنت متاكد أنك تريد إرجاع \%s\؟ -#: ../src/appfinder-window.c:799 +#: ../src/appfinder-window.c:863 msgid Failed to remove desktop file msgstr فشل حذف ملف سطح المكتب #. I18N: the first %s will be replace with users' applications directory, the #. * second with Hidden=true -#: ../src/appfinder-window.c:832 +#: ../src/appfinder-window.c:896 #, c-format msgid To unhide the item you have to manually remove the desktop file from \%s\ or open
[Xfce4-commits] midori:master Introduce Completion API with search and history classes
Updating branch refs/heads/master
to bd1d4f8cc00cc62b826e2d786aed75b0275020dd (commit)
from 2ffca48f81a5d4ed19a449428ba4c472f8317455 (commit)
commit bd1d4f8cc00cc62b826e2d786aed75b0275020dd
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Sep 27 20:34:57 2012 +0200
Introduce Completion API with search and history classes
The new API makes completion independent from the database and
uses pluggable, asynchronous backends. No new functionality.
extensions/wscript_build |2 +-
midori/midori-completion.vala| 152
midori/midori-historycompletion.vala | 113
midori/midori-locationaction.c | 331 --
midori/midori-searchcompletion.vala | 77
midori/wscript_build |2 +-
po/POTFILES.in |2 +
tests/completion.vala| 85 +
tests/extensions.c |1 +
tests/wscript_build |2 +-
10 files changed, 509 insertions(+), 258 deletions(-)
diff --git a/extensions/wscript_build b/extensions/wscript_build
index c09a92b..cf556c9 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -34,7 +34,7 @@ for extension in extensions:
obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
obj.vapi_dirs = '../midori ../katze'
-obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori midori-core katze'
+obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 midori midori-core
katze'
if bld.env['HAVE_GTK3']:
obj.packages += ' gtk+-3.0 webkitgtk-3.0'
else:
diff --git a/midori/midori-completion.vala b/midori/midori-completion.vala
new file mode 100644
index 000..f3327f5
--- /dev/null
+++ b/midori/midori-completion.vala
@@ -0,0 +1,152 @@
+/*
+ Copyright (C) 2012 Christian Dywan christ...@twotoasts.de
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+public class Suggestion : GLib.Object {
+public string? uri { get; set; }
+public string? markup { get; set; }
+public bool use_markup { get; set; }
+public string? background { get; set; }
+public GLib.Icon? icon { get; set; }
+public bool action { get; set; default = false; }
+
+public Suggestion (string? uri, string? markup, bool use_markup=false,
+string? background=null, GLib.Icon? icon=null) {
+
+GLib.Object (uri: uri, markup: markup, use_markup: use_markup,
+ background: background, icon: icon);
+}
+}
+
+public abstract class Completion : GLib.Object {
+public string? description { get; set; }
+public int max_items { get; internal set; default = 25; }
+internal int position { get; set; }
+
+public abstract void prepare (GLib.Object app);
+public abstract bool can_complete (string prefix);
+public abstract bool can_action (string action);
+public abstract async ListSuggestion? complete (string text, string?
action, Cancellable cancellable);
+}
+
+public class Autocompleter : GLib.Object {
+private GLib.Object app;
+private ListCompletion completions;
+private int next_position;
+public Gtk.ListStore model { get; private set; }
+private bool need_to_clear = false;
+private uint current_count = 0;
+private Cancellable? cancellable = null;
+
+public enum Columns {
+ICON,
+URI,
+MARKUP,
+BACKGROUND,
+YALIGN,
+N
+}
+
+public Autocompleter (GLib.Object app) {
+this.app = app;
+completions = new ListCompletion ();
+next_position = 0;
+model = new Gtk.ListStore (Columns.N,
+typeof (Gdk.Pixbuf), typeof (string), typeof (string),
+typeof (string), typeof (float));
+}
+
+public void add (Completion completion) {
+completion.prepare (app);
+completion.position = next_position;
+next_position += completion.max_items;
+completions.append (completion);
+}
+
+public bool can_complete (string text) {
+foreach (var completion in completions)
+if (completion.can_complete (text))
+return true;
+return false;
+}
+
+private void fill_model (GLib.Object? object, AsyncResult result) {
+var completion = object as Completion;
+ListSuggestion? suggestions = completion.complete.end (result);
+
[Xfce4-commits] midori:master Check resources to see if a file has subresources
Updating branch refs/heads/master
to 81ab79c12969f927bebaad756b88d3a3451f59ef (commit)
from bd1d4f8cc00cc62b826e2d786aed75b0275020dd (commit)
commit 81ab79c12969f927bebaad756b88d3a3451f59ef
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Oct 1 00:04:30 2012 +0200
Check resources to see if a file has subresources
katze/katze-net.c |2 +-
midori/main.c |3 ++-
midori/midori-browser.c | 19 +++
midori/midori-dialog.vala | 10 +-
midori/midori-view.c | 14 ++
midori/midori-view.h |3 +++
tests/browser.c | 13 +
7 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/katze/katze-net.c b/katze/katze-net.c
index 10b55bf..b17e368 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -96,7 +96,7 @@ katze_net_get_cached_path (KatzeNet*net,
if (subfolder)
{
-gchar* cache_path = g_build_filename (midori_paths_get_cache_dir (),
subfolder, NULL);
+gchar* cache_path = g_build_filename
(midori_paths_get_cache_dir_for_reading (), subfolder, NULL);
katze_mkdir_with_parents (cache_path, 0700);
cached_path = g_build_filename (cache_path, cached_filename, NULL);
g_free (cache_path);
diff --git a/midori/main.c b/midori/main.c
index dabe6c8..e56d4a3 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1480,7 +1480,8 @@ static void
signal_handler (int signal_id)
{
signal (signal_id, 0);
-midori_app_quit_cb (NULL, NULL);
+if (!midori_paths_is_readonly ())
+midori_app_quit_cb (NULL, NULL);
if (kill (getpid (), signal_id))
exit (1);
}
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 1f8c424..48efcb8 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -995,15 +995,10 @@ midori_browser_prepare_download (MidoriBrowser* browser,
}
static void
-midori_browser_save_resources (MidoriView* view,
+midori_browser_save_resources (GList* resources,
const gchar* folder)
{
-WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view
(view));
-WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
-WebKitWebDataSource* data_source = webkit_web_frame_get_data_source
(frame);
-GList* resources = webkit_web_data_source_get_subresources (data_source);
GList* list;
-
katze_mkdir_with_parents (folder, 0700);
for (list = resources; list; list = g_list_next (list))
@@ -1034,7 +1029,6 @@ midori_browser_save_resources (MidoriView* view,
g_free (sub_filename);
g_free (sub_path);
}
-g_list_free (resources);
}
void
@@ -1046,6 +1040,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
GtkWidget* dialog;
const gchar* title = midori_view_get_display_title (view);
gchar* filename;
+GList* resources = midori_view_get_subresources (view);
gboolean file_only = TRUE;
GtkWidget* checkbox = NULL;
@@ -1056,7 +1051,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
if (uri == NULL)
uri = midori_view_get_display_uri (view);
-if (midori_view_can_view_source (view))
+if (resources != NULL g_list_nth_data (resources, 1) != NULL)
{
file_only = FALSE;
checkbox = gtk_check_button_new_with_mnemonic (_(Save associated
_resources));
@@ -1090,21 +1085,21 @@ midori_browser_save_uri (MidoriBrowser* browser,
{
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
if (checkbox != NULL)
-file_only = !file_only !gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (checkbox));
-if (!file_only !g_str_equal (title, uri))
+file_only = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(checkbox));
+if (!file_only)
{
gchar* fullname = g_strconcat (filename, .html, NULL);
midori_view_save_source (view, uri, fullname);
g_free (fullname);
+midori_browser_save_resources (resources, filename);
}
else
midori_view_save_source (view, uri, filename);
-if (!file_only)
-midori_browser_save_resources (view, filename);
katze_assign (last_dir,
gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
}
gtk_widget_destroy (dialog);
+g_list_free (resources);
}
static void
diff --git a/midori/midori-dialog.vala b/midori/midori-dialog.vala
index f0f5b71..55b6bad 100644
--- a/midori/midori-dialog.vala
+++ b/midori/midori-dialog.vala
@@ -15,6 +15,11 @@ namespace Midori {
public void set_dialog_response (Gtk.ResponseType response) {
test_response = response;
}
+
+internal static string? test_filename = null;
+public void set_file_chooser_filename (string filename) {
+test_filename = filename;
+}
}
public
[Xfce4-commits] midori:master Return a filename, not a URI in midori_view_save_source
Updating branch refs/heads/master
to 6cddd1ff0efe9286d64e42b65359d8b3e30d2dde (commit)
from 81ab79c12969f927bebaad756b88d3a3451f59ef (commit)
commit 6cddd1ff0efe9286d64e42b65359d8b3e30d2dde
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Oct 5 01:03:46 2012 +0200
Return a filename, not a URI in midori_view_save_source
Fixes: https://bugs.launchpad.net/midori/+bug/1060270
midori/midori-view.c |2 +-
tests/browser.c |8
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index e06b302..150e1ec 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5184,7 +5184,7 @@ midori_view_save_source (MidoriView* view,
uri = midori_view_get_display_uri (view);
if (g_str_has_prefix (uri, file:///))
-return g_strdup (uri);
+return g_filename_from_uri (uri, NULL, NULL);
if (!outfile)
{
diff --git a/tests/browser.c b/tests/browser.c
index 73c36b3..0c24ba6 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -35,6 +35,8 @@ browser_create (void)
GtkWidget* view;
GFile* file;
gchar* uri;
+gchar* filename;
+gchar* filename2;
g_test_log_set_fatal_handler (skip_gtk_bugs, NULL);
@@ -56,6 +58,12 @@ browser_create (void)
midori_settings_set_download_folder (MIDORI_SETTINGS (settings),
temporary_downloads);
midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
+filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL);
+filename2 = g_filename_from_uri (uri, NULL, NULL);
+g_assert_cmpstr (filename, ==, filename2);
+g_free (filename);
+g_free (filename2);
+
/* View source for local file: should NOT use temporary file */
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page (browser, n);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
