[Xfce4-commits] Converting more gradient themes to Gtk 3
Updating branch refs/heads/peter/gtk3
to d21ebb88432202809961605797a5fcdc02da0e22 (commit)
from 381e98fcc9ad07b1b5e15d85131581f74dad5e41 (commit)
commit d21ebb88432202809961605797a5fcdc02da0e22
Author: Peter de Ridder
Date: Fri Nov 18 23:57:52 2011 +0100
Converting more gradient themes to Gtk 3
Xfce-orange, Xfce-redmondxp
configure.in.in |2 +
themes/orange/Makefile.am|3 +-
themes/{dawn => orange}/gtk-3.0/Makefile.am |2 +-
themes/{cadmium => orange}/gtk-3.0/gtk.css | 220 +---
themes/redmondxp/Makefile.am |3 +-
themes/redmondxp/gtk-3.0/Makefile.am |5 +
themes/{winter => redmondxp}/gtk-3.0/gtk.css | 233 --
7 files changed, 314 insertions(+), 154 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 60718f4..ac53117 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -135,8 +135,10 @@ themes/light/Makefile
themes/light/gtk-2.0/Makefile
themes/light/gtk-3.0/Makefile
themes/orange/gtk-2.0/Makefile
+themes/orange/gtk-3.0/Makefile
themes/orange/Makefile
themes/redmondxp/gtk-2.0/Makefile
+themes/redmondxp/gtk-3.0/Makefile
themes/redmondxp/Makefile
themes/saltlake/gtk-2.0/Makefile
themes/saltlake/gtk-3.0/Makefile
diff --git a/themes/orange/Makefile.am b/themes/orange/Makefile.am
index 6f702b7..3263c58 100644
--- a/themes/orange/Makefile.am
+++ b/themes/orange/Makefile.am
@@ -1,3 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = $(GTK_SUBDIRS)
+DIST_SUBDIRS = gtk-2.0 gtk-3.0
themedir = $(datadir)/themes/Xfce-orange
diff --git a/themes/dawn/gtk-3.0/Makefile.am b/themes/orange/gtk-3.0/Makefile.am
similarity index 50%
copy from themes/dawn/gtk-3.0/Makefile.am
copy to themes/orange/gtk-3.0/Makefile.am
index 0c75afe..7b537be 100644
--- a/themes/dawn/gtk-3.0/Makefile.am
+++ b/themes/orange/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-dawn/gtk-3.0
+themedir = $(datadir)/themes/Xfce-orange/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/orange/gtk-3.0/gtk.css
similarity index 50%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/orange/gtk-3.0/gtk.css
index 9723d08..84cd4ad 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/orange/gtk-3.0/gtk.css
@@ -1,21 +1,21 @@
@define-color fg_active #00;
-@define-color fg_insensitive #8e8e8a;
+@define-color fg_insensitive #858481;
@define-color fg_normal #00;
@define-color fg_prelight #00;
@define-color fg_selected #00;
-@define-color bg_active #cececa;
-@define-color bg_insensitive #ef;
-@define-color bg_normal #ef;
-@define-color bg_prelight #ea;
-@define-color bg_selected #ea;
+@define-color bg_active #fff9e1;
+@define-color bg_insensitive #f4f2ed;
+@define-color bg_normal #f4f2ed;
+@define-color bg_prelight #fff9e1;
+@define-color bg_selected #e0dcd7;
-@define-color base_active #cececa;
-@define-color base_insensitive #ef;
+@define-color base_active #e0dcd7;
+@define-color base_insensitive #f4f2ed;
@define-color base_normal #ff;
-@define-color base_prelight #d8dbe0;
-@define-color base_selected #ea;
+@define-color base_prelight #fff9e1;
+@define-color base_selected #ffe371;
@define-color text_active #00;
@define-color text_insensitive #00;
@@ -34,21 +34,21 @@
-GtkButton-child-displacement-x : 0;
-GtkButton-child-displacement-y : 1;
-GtkButton-default-spacing : 5;
--GtkWidget-focus-line-width : 1;
--GtkWidget-focus-padding : 2;
+-GtkWidget-focus-padding : 1;
-GtkCheckButton-indicator-size : 12;
--GtkMenuBar-internal-padding : 0;
--GtkMenuBar-shadow-type : out;
+-GtkMenuItem-selected-shadow-type: none;
/*GtkPaned::handle_full_size : 1*/
-GtkPaned-handle-size: 7;
--GtkRange-slider-width : 12;
--GtkRange-stepper-size : 12;
+-GtkRange-slider-width : 15;
+-GtkRange-stepper-size : 15;
-GtkRange-stepper-spacing: 0;
-GtkRange-trough-border : 0;
+-GtkScrollbar-has-backward-stepper: 1;
-GtkScrollbar-min-slider-length : 20;
--GtkToolBar-shadow-type : out;
+-GtkWidget-focus-line-width : 1;
+-GtkWidget-focus-padding : 4;
-GtkWidget-interior-focus: 5;
--GtkWidget-internal-padding : 2;
+-GtkWidget-internal-padding : 4;
border-width: 2 2;
@@ -136,7 +136,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -170,12 +170,20 @@ GtkCalendar:selected {
background-color: @base_active;
}
-.check, .radio {
+.check {
color: @text_normal;
background-color: @base_normal;
border-color: @fg_normal;
}
+.radio {
+color: @text_normal;
+background-color: @base_normal;
+border-color:
[Xfce4-commits] Swapped gradient order for active and selected
Updating branch refs/heads/peter/gtk3
to 381e98fcc9ad07b1b5e15d85131581f74dad5e41 (commit)
from 64be8a6e7ef052dff61c6a8dbf6902af200429f2 (commit)
commit 381e98fcc9ad07b1b5e15d85131581f74dad5e41
Author: Peter de Ridder
Date: Fri Nov 18 23:55:25 2011 +0100
Swapped gradient order for active and selected
Xfce-basic, Xfce-cadmium, Xfce-dusk
themes/basic/gtk-3.0/gtk.css |4 ++--
themes/cadmium/gtk-3.0/gtk.css |4 ++--
themes/dusk/gtk-3.0/gtk.css|4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css
index 994601d..c6bcd2b 100644
--- a/themes/basic/gtk-3.0/gtk.css
+++ b/themes/basic/gtk-3.0/gtk.css
@@ -26,7 +26,7 @@
}
.button:active {
-background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#9E9A91, 1.1)), to(shade(#9E9A91, 1.0)));
+background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#9E9A91, 1.0)), to(shade(#9E9A91, 1.1)));
}
.button:insensitive {
@@ -38,7 +38,7 @@
}
.button:selected {
-background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#4B6983, 1.1)), to(shade(#4B6983, 1.0)));
+background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#4B6983, 1.0)), to(shade(#4B6983, 1.1)));
}
.scrollbar, .scale {
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css
index d8be6b8..9723d08 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/cadmium/gtk-3.0/gtk.css
@@ -323,7 +323,7 @@ GtkCalendar:selected {
}
.slider.vertical:active, .progressbar.vertical:active {
-background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_active, 2.0)), to(shade(@bg_active, 1.0)));
+background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
}
.slider.vertical:insensitive, .progressbar.vertical:insensitive {
@@ -335,5 +335,5 @@ GtkCalendar:selected {
}
.slider.vertical:selected, .progressbar.vertical:selected {
-background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_selected, 2.0)), to(shade(@bg_selected, 1.0)));
+background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 2.0)));
}
diff --git a/themes/dusk/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css
index 35ac922..b363125 100644
--- a/themes/dusk/gtk-3.0/gtk.css
+++ b/themes/dusk/gtk-3.0/gtk.css
@@ -322,7 +322,7 @@ GtkCalendar:selected {
}
.slider.vertical:active {
-background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_active, 1.25)), to(shade(@bg_active, 1.0)));
+background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.25)));
}
.slider.vertical:insensitive {
@@ -334,6 +334,6 @@ GtkCalendar:selected {
}
.slider.vertical:selected {
-background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_selected, 1.25)), to(shade(@bg_selected, 1.0)));
+background-image: -gtk-gradient(linear, left top, right top,
from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 1.25)));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Compare addon hostnames null-safely
Updating branch refs/heads/master
to 82323c43a0beb89c0ba8c9540f80ad2bdadb9c71 (commit)
from 963747523e56d0d288aca5a311625f08a1924b4b (commit)
commit 82323c43a0beb89c0ba8c9540f80ad2bdadb9c71
Author: Christian Dywan
Date: Fri Nov 18 23:57:56 2011 +0100
Compare addon hostnames null-safely
extensions/addons.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/extensions/addons.c b/extensions/addons.c
index eb2d23f..f0dc8c9 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -118,7 +118,7 @@ addons_install_response (GtkWidget* infobar,
folder = "scripts";
else if (g_str_has_suffix (uri, ".user.css"))
folder = "styles";
-else if (!strcmp (hostname, "userscripts.org"))
+else if (!g_strcmp0 (hostname, "userscripts.org"))
{
/* http://userscripts.org/scripts/ACTION/SCRIPT_ID/NAME */
gchar* subpage = strchr (strchr (path + 1, '/') + 1, '/');
@@ -148,7 +148,7 @@ addons_install_response (GtkWidget* infobar,
folder = "scripts";
}
}
-else if (!strcmp (hostname, "userstyles.org"))
+else if (!g_strcmp0 (hostname, "userstyles.org"))
{
/* http://userstyles.org/styles/STYLE_ID/NAME */
gchar* subpage = strchr (path + 1, '/');
@@ -260,14 +260,14 @@ addons_notify_load_status_cb (MidoriView* view,
{
gchar* path;
gchar* hostname = midori_uri_parse_hostname (uri, &path);
- if (!strcmp (hostname, "userscripts.org")
+ if (!g_strcmp0 (hostname, "userscripts.org")
&& (g_str_has_prefix (path, "/scripts/show/")
|| g_str_has_prefix (path, "/scripts/review/")))
{
/* Main (with desc) and "source view" pages */
addons_uri_install (view, ADDONS_USER_SCRIPTS);
}
- else if (!strcmp (hostname, "userstyles.org")
+ else if (!g_strcmp0 (hostname, "userstyles.org")
&& g_str_has_prefix (path, "/styles/"))
{
gchar* subpage = strchr (path + 1, '/');
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Retain 'settings' group and highest slot for empty
Updating branch refs/heads/master
to 963747523e56d0d288aca5a311625f08a1924b4b (commit)
from 1515b1e8d9aec2d74f1694476735ce5e6fbc8a46 (commit)
commit 963747523e56d0d288aca5a311625f08a1924b4b
Author: Christian Dywan
Date: Fri Nov 18 23:54:49 2011 +0100
Retain 'settings' group and highest slot for empty
midori/midori-view.c |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 43bf765..c4bae49 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3672,7 +3672,6 @@ prepare_speed_dial_html (MidoriView* view,
MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
GKeyFile* key_file;
GString* markup = NULL;
-guint slot = 1;
guint slot_count = 1, i, grid_index = 3, slot_size;
gchar* speed_dial_head;
gchar* file_path;
@@ -3744,6 +3743,7 @@ prepare_speed_dial_html (MidoriView* view,
gchar* title = g_key_file_get_string (key_file, groups[i],
"title", NULL);
gchar* thumb_file = sokoke_build_thumbnail_path (uri);
gchar* encoded;
+guint slot = atoi (groups[i] + strlen ("Dial "));
if (g_access (thumb_file, F_OK) == 0)
{
@@ -3761,7 +3761,6 @@ prepare_speed_dial_html (MidoriView* view,
}
g_free (thumb_file);
-slot = atoi (groups[i] + strlen ("Dial "));
g_string_append_printf (markup,
""
""
@@ -3772,10 +3771,9 @@ prepare_speed_dial_html (MidoriView* view,
g_free (title);
g_free (encoded);
}
-else
+else if (strcmp (groups[i], "settings"))
g_key_file_remove_group (key_file, groups[i], NULL);
-slot++;
g_free (uri);
}
g_strfreev (groups);
@@ -3784,7 +3782,7 @@ prepare_speed_dial_html (MidoriView* view,
""
""
"%s\n",
-slot, slot, _("Click to add a shortcut"));
+slot_count + 1, slot_count + 1, _("Click to add a shortcut"));
g_string_append_printf (markup,
"\n\n\n");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Only show one empty speed dial shortcut at the end
Updating branch refs/heads/master
to 1515b1e8d9aec2d74f1694476735ce5e6fbc8a46 (commit)
from e0168e5a94b612909ef0218010411fbf2413bff6 (commit)
commit 1515b1e8d9aec2d74f1694476735ce5e6fbc8a46
Author: Christian Dywan
Date: Fri Nov 18 22:17:39 2011 +0100
Only show one empty speed dial shortcut at the end
And discard invalid groups automatically.
midori/midori-view.c | 29 ++---
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 35c4af7..43bf765 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3736,14 +3736,12 @@ prepare_speed_dial_html (MidoriView* view,
g_string_append_printf (markup,
".cross { left: -14px }");
-while (slot <= slot_count)
+for (i = 0; groups[i]; i++)
{
-gchar* dial_entry = g_strdup_printf ("Dial %d", slot);
-gchar* uri = g_key_file_get_string (key_file, dial_entry, "uri", NULL);
-
-if (uri && *uri && *uri != '#')
+gchar* uri = g_key_file_get_string (key_file, groups[i], "uri", NULL);
+if (uri && strstr (uri, "://"))
{
-gchar* title = g_key_file_get_string (key_file, dial_entry,
"title", NULL);
+gchar* title = g_key_file_get_string (key_file, groups[i],
"title", NULL);
gchar* thumb_file = sokoke_build_thumbnail_path (uri);
gchar* encoded;
@@ -3759,10 +3757,11 @@ prepare_speed_dial_html (MidoriView* view,
{
encoded = g_strdup ("");
if (load_missing)
-midori_view_speed_dial_get_thumb (view, dial_entry, uri);
+midori_view_speed_dial_get_thumb (view, groups[i], uri);
}
g_free (thumb_file);
+slot = atoi (groups[i] + strlen ("Dial "));
g_string_append_printf (markup,
""
""
@@ -3774,18 +3773,18 @@ prepare_speed_dial_html (MidoriView* view,
g_free (encoded);
}
else
-{
-g_string_append_printf (markup,
-""
-""
-"%s\n",
-slot, slot, _("Click to add a shortcut"));
-}
+g_key_file_remove_group (key_file, groups[i], NULL);
slot++;
-g_free (dial_entry);
g_free (uri);
}
+g_strfreev (groups);
+
+g_string_append_printf (markup,
+""
+""
+"%s\n",
+slot, slot, _("Click to add a shortcut"));
g_string_append_printf (markup,
"\n\n\n");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Undo "Don't show empty speed dial shortcuts in-between"
Updating branch refs/heads/master
to e0168e5a94b612909ef0218010411fbf2413bff6 (commit)
from bcc4373857077d32b73b211f6d743ec0ddcddb90 (commit)
commit e0168e5a94b612909ef0218010411fbf2413bff6
Author: Christian Dywan
Date: Fri Nov 18 21:21:50 2011 +0100
Undo "Don't show empty speed dial shortcuts in-between"
This needs more work. The way it is, dial count is broken.
midori/midori-view.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 204e854..35c4af7 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3741,7 +3741,7 @@ prepare_speed_dial_html (MidoriView* view,
gchar* dial_entry = g_strdup_printf ("Dial %d", slot);
gchar* uri = g_key_file_get_string (key_file, dial_entry, "uri", NULL);
-if (uri && strstr (uri, "://") != NULL)
+if (uri && *uri && *uri != '#')
{
gchar* title = g_key_file_get_string (key_file, dial_entry,
"title", NULL);
gchar* thumb_file = sokoke_build_thumbnail_path (uri);
@@ -3773,7 +3773,7 @@ prepare_speed_dial_html (MidoriView* view,
g_free (title);
g_free (encoded);
}
-else if (slot == slot_count)
+else
{
g_string_append_printf (markup,
""
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Only focus findbar when repeatedly triggering it
Updating branch refs/heads/master
to bcc4373857077d32b73b211f6d743ec0ddcddb90 (commit)
from 4c2fd067ff39d86d8447643c13cea56c54575adb (commit)
commit bcc4373857077d32b73b211f6d743ec0ddcddb90
Author: Christian Dywan
Date: Fri Nov 18 21:20:15 2011 +0100
Only focus findbar when repeatedly triggering it
It can be closed with Escape.
toolbars/midori-findbar.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index 3aa9191..548b546 100644
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -158,7 +158,7 @@ void
midori_findbar_invoke (MidoriFindbar* findbar)
{
if (gtk_widget_get_visible (GTK_WIDGET (findbar)))
-midori_findbar_done (findbar);
+gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text));
else
{
MidoriBrowser* browser = midori_browser_get_for_widget
(findbar->find_text);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Update for Malay translation
Updating branch refs/heads/master
to e1f5db9047b0c0748bc33e293b49b5055c68b3de (commit)
from 126ce493d4fec0d71c7f304b5bef4a66af8149f6 (commit)
commit e1f5db9047b0c0748bc33e293b49b5055c68b3de
Author: Mohd. Nadzrin Sapari
Date: Fri Nov 18 19:06:34 2011 +0100
l10n: Update for Malay translation
New status: 55 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{zh_CN.po => ms.po} | 132 ---
1 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/po/zh_CN.po b/po/ms.po
similarity index 69%
copy from po/zh_CN.po
copy to po/ms.po
index 1c59520..b1d3fc1 100644
--- a/po/zh_CN.po
+++ b/po/ms.po
@@ -1,122 +1,124 @@
-# Chinese translations for tumbler package
-# tumbler 软件包的简体中文翻译.
-# Copyright (C) 2009 THE tumbler'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the tumbler package.
-# Hunt Xu , 2009, 2010.
-# Chipong Luo , 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: tumbler\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-05 11:04+\n"
-"PO-Revision-Date: 2010-11-23 23:13+0800\n"
-"Last-Translator: Chipong Luo \n"
-"Language-Team: Chinese (simplified) \n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2011-11-18 13:56+\n"
+"PO-Revision-Date: 2011-11-19 02:04+0800\n"
+"Last-Translator: Puretech \n"
+"Language-Team: Malay <>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: ../tumblerd/tumbler-cache-service.c:413
#, c-format
msgid "Another thumbnail cache service is already running"
-msgstr "另一个缩略图缓存服务已在运行"
+msgstr "Perkhidmatan cache lakaran kecil lain telah pun berjalan"
#: ../tumblerd/tumbler-group-scheduler.c:485
#: ../tumblerd/tumbler-lifo-scheduler.c:421
#, c-format
msgid "No thumbnailer available for \"%s\""
-msgstr "没有缩略图生成器可用于 “%s”"
+msgstr "Tiada lakaran kecil didapati untuk \"%s\""
#: ../tumblerd/tumbler-lifecycle-manager.c:207
msgid "The thumbnailer service is shutting down"
-msgstr "该缩略图生成器服务正在关闭"
+msgstr "Servis lakaran kecil sedang ditutup"
#: ../tumblerd/tumbler-service.c:758
#, c-format
msgid "Another generic thumbnailer is already running"
-msgstr "另一个通用的缩略图生成器已在运行"
+msgstr "Perkhidmatan generik lakaran kenit lain telah pun berjalan"
#: ../tumblerd/tumbler-service.c:867
msgid "Unsupported thumbnail flavor requested"
-msgstr "请求了一个不支持的缩略图类型"
+msgstr "Meminta lakaran kecil yang tidak disokong"
#: ../tumblerd/tumbler-specialized-thumbnailer.c:461
msgid "Failed to call the specialized thumbnailer: timeout"
-msgstr "无法调用指定的缩略图生成器：超时"
+msgstr "Gagal memanggil lakaran.kecil khas: masa tamat"
#: ../tumblerd/tumbler-specialized-thumbnailer.c:470
#, c-format
msgid "Failed to call the specialized thumbnailer: %s"
-msgstr "无法调用指定的缩略图生成器：%s"
+msgstr "Gagal memanggil lakaran.kecil khas: %s"
#: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895
#, c-format
msgid "Failed to load the file \"%s\": %s"
-msgstr "无法载入文件 “%s”：%s"
+msgstr "Gagal memuatkan fail \"%s\": %s"
#: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521
#: ../tumblerd/tumbler-manager.c:535
#, c-format
msgid "Malformed section \"%s\" in file \"%s\": %s"
-msgstr "文件 “%2$s” 中的异常段 “%1$s”：%3$s"
+msgstr "Seksyen cacat \"%s\" dalam fail \"%s\": %s"
#: ../tumblerd/tumbler-manager.c:548
#, c-format
msgid ""
"Malformed section \"%s\" in file \"%s\": Mismatch between section name and "
"UriScheme/MimeType"
-msgstr "文件 “%2$s” 中的异常段 “%1$s”：段名和 UriScheme/MimeType 不匹配。"
+msgstr ""
+"Seksyen cacat \"%s\" dalam fail \"%s\": Tidak sepadan antara nama seksyen "
+"dan UriScheme/MimeType"
#: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922
#: ../tumblerd/tumbler-manager.c:936
#, c-format
msgid "Malformed file \"%s\": %s"
-msgstr "异常的文件 “%s”：%s"
+msgstr "Fail cacat \"%s\": %s"
#: ../tumblerd/tumbler-manager.c:962
#, c-format
msgid "Failed to determine last modified time of \"%s\""
-msgstr "无法确定 “%s” 上次修改的时间"
+msgstr "Gagal untuk menentukan masa terakhir ubahsuai \"%s\""
#: ../tumblerd/tumbler-manager.c:1863
#, c-format
msgid "Another thumbnailer manager is already running"
-msgstr "另一个缩略图管理器已在运行"
+msgstr "Pengurus lakaran kecil lain sedang berjalan"
#. set the application name. Translators: Don't translate "Tumbler".
#: ../tumblerd/main.c:83
msgid "Tumbler Thumbnailing Service"
-msgstr "Tumbler 缩略图服务"
+msgstr "Servis Lakaran Kecil Tumbler"
#: ../tumblerd/main.c:98
#, c-format
msgid "Failed to connect to the D-Bus session bus: %s"
-msgstr "无法与 D-Bus 会话总线连接：%s"
+msgstr "Gagal menyambung ke sesi bus D-Bus: %s"
#: ../tumblerd/main.c:156
#, c-format
msgid "Failed to load specialized thumbnailers into the registry: %s"
-msgstr "无法载入指定的缩略图生成器至注册档案：%s"
+msgstr "Gagal memuatkan lakaran kecil khas ke dalam daftar: %s"
#: ../tumblerd/main
[Xfce4-commits] Recompute windows positions/maximization even if the overall size of the screen hasn't changed as the actual layout of the monitors may have changed nevertheless.
Updating branch refs/heads/xfce-4.8
to 99f769bc6e214933716df2dfa9d15b959dcd69d2 (commit)
from 6c6d21658c2a05188af8b1267db1a79298bd2e53 (commit)
commit 99f769bc6e214933716df2dfa9d15b959dcd69d2
Author: Olivier Fourdan
Date: Fri Nov 18 18:39:40 2011 +0100
Recompute windows positions/maximization even if the overall size of the
screen hasn't changed as the actual layout of the monitors may have changed
nevertheless.
src/events.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/events.c b/src/events.c
index b7ab6e0..8ca3d7e 100644
--- a/src/events.c
+++ b/src/events.c
@@ -2824,10 +2824,10 @@ size_changed_cb(GdkScreen *gscreen, gpointer data)
placeSidewalks (screen_info, screen_info->params->wrap_workspaces);
-clientScreenResize (screen_info, FALSE);
-
compositorUpdateScreenSize (screen_info);
}
+
+clientScreenResize (screen_info, FALSE);
}
/*
@@ -2876,14 +2876,14 @@ monitors_changed_cb(GdkScreen *gscreen, gpointer data)
screen_info->width, screen_info->height,
screen_info->margins);
placeSidewalks (screen_info, screen_info->params->wrap_workspaces);
-
-clientScreenResize (screen_info, (screen_info->num_monitors <
previous_num_monitors));
}
if (size_changed)
{
compositorUpdateScreenSize (screen_info);
}
+
+clientScreenResize (screen_info, (screen_info->num_monitors <
previous_num_monitors));
}
void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Restore the grab for double-click detection as it fails with "easy-click" and fix screen/monitor change signals.
Updating branch refs/heads/master
to 7522f6b248341f0ce00973ed2d5198d9c8628ad3 (commit)
from d7273d90a46c328cfdc26ff7f000cefb1271 (commit)
commit 7522f6b248341f0ce00973ed2d5198d9c8628ad3
Author: Olivier Fourdan
Date: Fri Nov 18 18:34:49 2011 +0100
Restore the grab for double-click detection as it fails with "easy-click"
and fix screen/monitor change signals.
src/events.c | 24 ++--
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/events.c b/src/events.c
index 5ddad9a..83de2a5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -235,6 +235,16 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent *
ev, gboolean allow_doub
g_return_val_if_fail (w != None, XFWM_BUTTON_UNDEFINED);
display_info = screen_info->display_info;
+g = myScreenGrabPointer (screen_info, DOUBLE_CLICK_GRAB, None,
ev->xbutton.time);
+
+if (!g)
+{
+TRACE ("grab failed in typeOfClick");
+gdk_beep ();
+myScreenUngrabPointer (screen_info, ev->xbutton.time);
+return XFWM_BUTTON_UNDEFINED;
+}
+
passdata.display_info = display_info;
passdata.button = ev->xbutton.button;
passdata.w = w;
@@ -261,6 +271,8 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent *
ev, gboolean allow_doub
eventFilterPop (display_info->xfilter);
TRACE ("leaving typeOfClick loop");
+myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+
return (XfwmButtonClickType) passdata.clicks;
}
@@ -2801,10 +2813,10 @@ size_changed_cb(GdkScreen *gscreen, gpointer data)
placeSidewalks (screen_info, screen_info->params->wrap_workspaces);
-clientScreenResize (screen_info, FALSE);
-
compositorUpdateScreenSize (screen_info);
}
+
+clientScreenResize (screen_info, FALSE);
}
/*
@@ -2853,14 +2865,14 @@ monitors_changed_cb(GdkScreen *gscreen, gpointer data)
screen_info->width, screen_info->height,
screen_info->margins);
placeSidewalks (screen_info, screen_info->params->wrap_workspaces);
-
-clientScreenResize (screen_info, (screen_info->num_monitors <
previous_num_monitors));
}
if (size_changed)
{
compositorUpdateScreenSize (screen_info);
}
+
+clientScreenResize (screen_info, (screen_info->num_monitors <
previous_num_monitors));
}
void
@@ -2874,9 +2886,9 @@ initPerScreenCallbacks (ScreenInfo *screen_info)
g_signal_connect (G_OBJECT (myScreenGetGtkWidget (screen_info)),
"client_event",
GTK_SIGNAL_FUNC (client_event_cb), NULL);
g_object_connect (G_OBJECT(screen_info->gscr),
- "signal::notify::size-changed",
+ "signal::size-changed",
G_CALLBACK(size_changed_cb), (gpointer) (screen_info),
- "signal::notify::monitors-changed",
+ "signal::monitors-changed",
G_CALLBACK(monitors_changed_cb), (gpointer)
(screen_info),
NULL);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Reintroduce the double-click timeout, this is unrelated to events being lost, Remove the active grab for the double-click detection.
Updating branch refs/heads/master
to d7273d90a46c328cfdc26ff7f000cefb1271 (commit)
from 18199db7428b4bd1a0c5aaa60ebdea3e96178006 (commit)
commit d7273d90a46c328cfdc26ff7f000cefb1271
Author: Olivier Fourdan
Date: Thu Nov 17 13:13:48 2011 +0100
Reintroduce the double-click timeout, this is unrelated to events being
lost,
Remove the active grab for the double-click detection.
src/events.c | 46 +++---
src/focus.c |7 ++-
2 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/events.c b/src/events.c
index 917523e..5ddad9a 100644
--- a/src/events.c
+++ b/src/events.c
@@ -123,6 +123,7 @@ struct _XfwmButtonClickData
Window w;
guint button;
guint clicks;
+guint timeout;
gint x0;
gint y0;
guint t0;
@@ -134,6 +135,23 @@ struct _XfwmButtonClickData
gboolean allow_double_click;
};
+static gboolean
+typeOfClick_end (gpointer data)
+{
+XfwmButtonClickData *passdata;
+
+passdata = (XfwmButtonClickData *) data;
+if (passdata->timeout)
+{
+g_source_remove (passdata->timeout);
+passdata->timeout = 0;
+}
+
+gtk_main_quit ();
+
+return (FALSE);
+}
+
static eventFilterStatus
typeOfClick_event_filter (XEvent * xevent, gpointer data)
{
@@ -199,7 +217,7 @@ typeOfClick_event_filter (XEvent * xevent, gpointer data)
TRACE ("time=%ims (timeout=%ims)", (gint) passdata->tcurrent - (gint)
passdata->t0, passdata->double_click_time);
TRACE ("dist x=%i (max=%i)", ABS (passdata->x0 - passdata->xcurrent),
passdata->double_click_distance);
TRACE ("dist y=%i (max=%i)", ABS (passdata->y0 - passdata->ycurrent),
passdata->double_click_distance);
-gtk_main_quit ();
+typeOfClick_end (data);
}
return status;
@@ -217,16 +235,6 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent *
ev, gboolean allow_doub
g_return_val_if_fail (w != None, XFWM_BUTTON_UNDEFINED);
display_info = screen_info->display_info;
-g = myScreenGrabPointer (screen_info, DOUBLE_CLICK_GRAB, None,
ev->xbutton.time);
-
-if (!g)
-{
-TRACE ("grab failed in typeOfClick");
-gdk_beep ();
-myScreenUngrabPointer (screen_info, ev->xbutton.time);
-return XFWM_BUTTON_UNDEFINED;
-}
-
passdata.display_info = display_info;
passdata.button = ev->xbutton.button;
passdata.w = w;
@@ -242,14 +250,17 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent *
ev, gboolean allow_doub
passdata.double_click_distance = display_info->double_click_distance;
TRACE ("Double click time= %i, distance=%i\n",
display_info->double_click_time,
display_info->double_click_distance);
+passdata.timeout = g_timeout_add_full (G_PRIORITY_HIGH,
+ display_info->double_click_time,
+ (GSourceFunc) typeOfClick_end,
+ (gpointer) &passdata, NULL);
+
TRACE ("entering typeOfClick loop");
eventFilterPush (display_info->xfilter, typeOfClick_event_filter,
&passdata);
gtk_main ();
eventFilterPop (display_info->xfilter);
TRACE ("leaving typeOfClick loop");
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
-
return (XfwmButtonClickType) passdata.clicks;
}
@@ -896,8 +907,13 @@ handleButtonPress (DisplayInfo *display_info, XButtonEvent
* ev)
{
XfwmButtonClickType tclick;
-tclick = typeOfClick (screen_info, c->window, (XEvent *) ev,
FALSE);
-if (tclick != XFWM_BUTTON_UNDEFINED)
+tclick = typeOfClick (screen_info, c->window, (XEvent *) ev,
TRUE);
+
+if (tclick == XFWM_BUTTON_DOUBLE_CLICK)
+{
+clientClose (c);
+}
+else if (tclick != XFWM_BUTTON_UNDEFINED)
{
if (!(c->type & WINDOW_TYPE_DONT_FOCUS))
{
diff --git a/src/focus.c b/src/focus.c
index 85c0441..5b02c59 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -176,11 +176,16 @@ clientFocusNew(Client * c)
}
else if (client_focus->win_layer < c->win_layer)
{
-/* We short don't use focus stealing prevention against upper
layers */
+/* We don't use focus stealing prevention against upper layers */
TRACE ("Ignoring startup prevention because the current focused
window is on a lower layer");
give_focus = TRUE;
prevented = FALSE;
}
+else if (FLAG_TEST (client_focus->xfwm_flags,
XFWM_FLAG_MOVING_RESIZING))
+{
+give_focus = FALSE;
+prevented = TRUE;
+}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME |
CLIENT_FLAG_HAS_USER_TIME))
[Xfce4-commits] l10n: Updated Hungarian (hu) translation to 100%
Updating branch refs/heads/master to 5bd98c42519d074b59f72fe47437ddeb3b1c5a4e (commit) from 3be3ddc0deffb1c4d90e096d5792f64c65bf31c3 (commit) commit 5bd98c42519d074b59f72fe47437ddeb3b1c5a4e Author: Gabor Kelemen Date: Fri Nov 18 15:08:07 2011 +0100 l10n: Updated Hungarian (hu) translation to 100% New status: 83 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hu.po | 311 -- 1 files changed, 282 insertions(+), 29 deletions(-) diff --git a/po/hu.po b/po/hu.po index b48bbf0..28c41e7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2,70 +2,71 @@ # Copyright 2009. Free Software Foundation, Inc. # This file is distributed under the same license as the libxfce4ui package. # -# Gabor Kelemen , 2009. +# Gabor Kelemen , 2009, 2011. +# Sándor Zelenák , 2011. msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: libxfce4ui master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-07-17 15:02+0200\n" +"POT-Creation-Date: 2011-11-05 11:07+\n" +"PO-Revision-Date: 2011-11-18 15:07+0100\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:68 msgid "Information" msgstr "Információ" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:101 msgid "Warning" msgstr "Figyelmeztetés" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:135 msgid "Error" msgstr "Hiba" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:186 msgid "Question" msgstr "Kérdés" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1402 msgid "Session management client ID" msgstr "Munkamenet-kezelési kliens azonosítója" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1402 msgid "ID" msgstr "Azonosító" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "Disable session management" msgstr "A munkamenet-kezelés letiltása" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1413 msgid "Session management options" msgstr "Munkamenet-kezelés kapcsolói" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1414 msgid "Show session management options" msgstr "Munkamenet-kezelési kapcsolók megjelenítése" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1590 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "A munkamenet-kezelőhöz való csatlakozás meghiúsult: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1597 #, c-format msgid "Session manager did not return a valid client id" msgstr "A munkamenet-kezelő nem adott vissza érvényes kliensazonosítót" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:406 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" @@ -131,32 +132,32 @@ msgstr "Ütköző műveletek ehhez: %s" msgid "This shortcut is already being used for something else." msgstr "Ez a gyorsbillentyű már használatban van valami másra." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 msgid "Window Manager Action Shortcut" msgstr "Ablakkezelő-művelet gyorsbillentyűje" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215 msgid "Action:" msgstr "Művelet:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Command Shortcut" msgstr "Parancs gyorsbillentyűje" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:210 msgid "Command:" msgstr "Parancs:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 msgid "Shortcut" msgstr "Gyorsbillentyű" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:255 msgid "Shortcut:" msgstr "Gyorsbillentyű:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:300 msgid "Could not grab the keyboard." msgstr "A billentyűzet nem ragadható meg." @@ -172,6 +173,260 @@ msgstr "Címzett ablak" msgid "Xfce 4 Widgets" msgstr "Xfce 4 felület
[Xfce4-commits] Fix the indentation offset in ThunarShortcutGroup.
Updating branch refs/heads/jannis/new-shortcuts-pane to c9cb2abc422806feb521eaa474662a76dbdbae23 (commit) from 37bc2b962d2dc834e8ad34853f7a0ba7d15adb49 (commit) commit c9cb2abc422806feb521eaa474662a76dbdbae23 Author: Jannis Pohlmann Date: Fri Nov 18 11:10:37 2011 + Fix the indentation offset in ThunarShortcutGroup. thunar/thunar-shortcut-group.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c index ee8e16b..56ce8b1 100644 --- a/thunar/thunar-shortcut-group.c +++ b/thunar/thunar-shortcut-group.c @@ -359,7 +359,7 @@ thunar_shortcut_group_apply_indentation (ThunarShortcutGroup *group, /* apply the indentation to the shortcut alignment */ alignment = thunar_shortcut_get_alignment (shortcut); - g_object_set (alignment, "left-padding", expander_size + expander_spacing * 2 + 1, NULL); + g_object_set (alignment, "left-padding", expander_size + expander_spacing * 2 + 2, NULL); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
