[Xfce4-commits] l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 73b7b1bed825904b12259f12d982b8ee6874c57b (commit) from c94a57065af9f15daae505117955666e184ff8f4 (commit) commit 73b7b1bed825904b12259f12d982b8ee6874c57b Author: Masato Hashimoto Date: Sun Feb 5 10:02:36 2012 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 68 ++--- 1 files changed, 42 insertions(+), 26 deletions(-) diff --git a/po/ja.po b/po/ja.po index 25913f0..7845ff2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,19 +2,19 @@ # Copyright (C) 2007 Jannis Pohlmann. # This file is distributed under the same license as the xfce4menu package. # Daichi Kawahata , 2007. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4menu 0.1.0svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-21 04:06+\n" -"PO-Revision-Date: 2010-12-11 22:35+0900\n" +"POT-Creation-Date: 2012-02-05 17:45+0900\n" +"PO-Revision-Date: 2012-02-05 18:02+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/xfce/xfce-accessories.directory.in.h:1 @@ -57,22 +57,30 @@ msgstr "グラフィックス" msgid "Graphics creation and manipulation applications" msgstr "グラフィック作成および操作アプリケーションです" -#: ../data/xfce/xfce-multimedia.directory.in.h:1 -msgid "Audio and video players and editors" -msgstr "オーディオおよびビデオのプレイヤーおよびエディタです" +#: ../data/xfce/xfce-hardware.directory.in.h:1 +msgid "Hardware" +msgstr "ハードウェア" -#: ../data/xfce/xfce-multimedia.directory.in.h:2 +#: ../data/xfce/xfce-hardware.directory.in.h:2 +msgid "Settings for several hardware devices" +msgstr "一部のハードウェアデバイスを設定します" + +#: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid "Multimedia" msgstr "マルチメディア" -#: ../data/xfce/xfce-network.directory.in.h:1 -msgid "Applications for Internet access" -msgstr "インターネットアクセス用アプリケーションです" +#: ../data/xfce/xfce-multimedia.directory.in.h:2 +msgid "Audio and video players and editors" +msgstr "オーディオおよびビデオのプレイヤーおよびエディタです" -#: ../data/xfce/xfce-network.directory.in.h:2 +#: ../data/xfce/xfce-network.directory.in.h:1 msgid "Internet" msgstr "インターネット" +#: ../data/xfce/xfce-network.directory.in.h:2 +msgid "Applications for Internet access" +msgstr "インターネットアクセス用アプリケーションです" + #: ../data/xfce/xfce-office.directory.in.h:1 msgid "Office" msgstr "オフィス" @@ -82,29 +90,37 @@ msgid "Office and productivity applications" msgstr "オフィスおよび生産性アプリケーションです" #: ../data/xfce/xfce-other.directory.in.h:1 +msgid "Other" +msgstr "その他" + +#: ../data/xfce/xfce-other.directory.in.h:2 msgid "Applications that don't fit into other categories" msgstr "他のカテゴリに含まれないアプリケーションです" -#: ../data/xfce/xfce-other.directory.in.h:2 -msgid "Other" -msgstr "その他" +#: ../data/xfce/xfce-personal.directory.in.h:1 +msgid "Personal" +msgstr "ユーザー向け" -#: ../data/xfce/xfce-screensavers.directory.in.h:1 -msgid "Screensaver applets" -msgstr "スクリーンセーバアプレット" +#: ../data/xfce/xfce-personal.directory.in.h:2 +msgid "Personal settings" +msgstr "ユーザー向けの設定を変更します" -#: ../data/xfce/xfce-screensavers.directory.in.h:2 +#: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid "Screensavers" msgstr "スクリーンセーバ" -#: ../data/xfce/xfce-settings.directory.in.h:1 -msgid "Desktop and system settings applications" -msgstr "デスクトップおよびシステム設定アプリケーションです" +#: ../data/xfce/xfce-screensavers.directory.in.h:2 +msgid "Screensaver applets" +msgstr "スクリーンセーバアプレット" -#: ../data/xfce/xfce-settings.directory.in.h:2 +#: ../data/xfce/xfce-settings.directory.in.h:1 msgid "Settings" msgstr "設定" +#: ../data/xfce/xfce-settings.directory.in.h:2 +msgid "Desktop and system settings applications" +msgstr "デスクトップおよびシステム設定アプリケーションです" + #: ../data/xfce/xfce-system.directory.in.h:1 msgid "System" msgstr "システム" @@ -113,17 +129,17 @@ msgstr "システム" msgid "System tools and utilities" msgstr "システムツールおよびユーティリティです" -#: ../garcon/garcon-menu.c:698 +#: ../garcon/garcon-menu.c:706 #, c-format msgid "File \"%s\" not found" msgstr "ファイル \"%s\" が見つかりませんでした" -#: ../garcon/garcon-menu-parser.c:278 +#: ../garcon/garcon-menu-parser.c:280 #, c-format msgid "Could not load menu file data from %s: %s" msgstr "%s からのメニューファイルデータを読み込めませんでした: %s" -#: ../garcon/garcon-menu-parser.c:284 +#: ../garcon/garcon-menu-parser.c:287 #, c-format msgid "Could not load menu file data from %s" msgstr "%s からメニューファイルデータを読み込めませんでした" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Debug message tweaks.
Updating branch refs/heads/master
to 4f75e22cc89f0b54f12799f094ba5dfab72be2ff (commit)
from 51b579d06066b30e1146174d387f241cf0a0f467 (commit)
commit 4f75e22cc89f0b54f12799f094ba5dfab72be2ff
Author: David Schneider
Date: Sat Feb 4 20:26:09 2012 -0800
Debug message tweaks.
panel-plugin/ewmh.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/panel-plugin/ewmh.c b/panel-plugin/ewmh.c
index 549cad3..0f1cd99 100644
--- a/panel-plugin/ewmh.c
+++ b/panel-plugin/ewmh.c
@@ -70,12 +70,12 @@ static gchar *get_property (Display *disp, Window win, Atom
xa_prop_type,
MAX_PROPERTY_VALUE_LEN / 4, False,
xa_prop_type, &xa_ret_type, &ret_format,
&ret_nitems, &ret_bytes_after, &ret_prop) != Success) {
-DBG("Cannot get %s property.\n", prop_name);
+DBG("Cannot get %s property.", prop_name);
return NULL;
}
if (xa_ret_type != xa_prop_type) {
-DBG("Invalid type of %s property.\n", prop_name);
+DBG("Invalid type of %s property.", prop_name);
XFree(ret_prop);
return NULL;
}
@@ -125,8 +125,8 @@ Window *get_client_list (Display *disp, gulong *size)
XA_WINDOW, "_NET_CLIENT_LIST", size)) == NULL) {
if ((client_list = (Window *)get_property(disp,
DefaultRootWindow(disp),
XA_CARDINAL, "_WIN_CLIENT_LIST", size)) == NULL) {
-DBG("Cannot get client list properties. \n"
- "(_NET_CLIENT_LIST or _WIN_CLIENT_LIST)\n");
+DBG("Cannot get client list properties "
+ "(_NET_CLIENT_LIST nor _WIN_CLIENT_LIST).");
return NULL;
}
}
@@ -261,8 +261,8 @@ void show_window (Display *disp, Window win)
XA_CARDINAL, "_NET_CURRENT_DESKTOP", NULL))) {
if (! (cur_desktop = (unsigned long *)get_property(disp, root,
XA_CARDINAL, "_WIN_WORKSPACE", NULL))) {
-DBG("Cannot get current desktop properties. "
-"(_NET_CURRENT_DESKTOP or _WIN_WORKSPACE property)");
+DBG("Cannot get current desktop properties "
+"(_NET_CURRENT_DESKTOP nor _WIN_WORKSPACE).");
return;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] 0.8.0 release
Updating branch refs/heads/master to 2d9f412a5622b79896697c1c16a26fd120baad63 (commit) from 4f75e22cc89f0b54f12799f094ba5dfab72be2ff (commit) commit 2d9f412a5622b79896697c1c16a26fd120baad63 Author: David Schneider Date: Sun Feb 5 01:26:35 2012 -0800 0.8.0 release NEWS|4 ++-- README |6 +++--- THANKS |3 --- configure.ac.in |6 +++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index be9fc84..bee4388 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,3 @@ -0.0.1 +0.8.0 = -- Initial testing release +- Initial release, lacking translations diff --git a/README b/README index 97fab36..f43ac5e 100644 --- a/README +++ b/README @@ -43,6 +43,6 @@ Embed a terminal: How to report bugs? === -Bugs should be reported to the Xfce bug tracking system -(http://bugzilla.xfce.org, product 'Xfce Panel Plugins', Component -'Embed plugin'). You will need to create an account for yourself. +Bugs should be reported to the Xfce bug tracking system: +http://bugzilla.xfce.org/enter_bug.cgi?product=xfce4-embed-plugin +You will need to create an account for yourself. diff --git a/THANKS b/THANKS index a697867..d7e4aa7 100644 --- a/THANKS +++ b/THANKS @@ -15,6 +15,3 @@ Translators (sorted by language): These people have translated the embed plugin to foreign languages. -Other contributors (sorted by name): - - diff --git a/configure.ac.in b/configure.ac.in index 91342ef..6dda273 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,11 +9,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([embed_version_major], [0]) -m4_define([embed_version_minor], [0]) -m4_define([embed_version_micro], [2]) +m4_define([embed_version_minor], [8]) +m4_define([embed_version_micro], [0]) m4_define([embed_version_nano], []) dnl leave this empty to have no nano version m4_define([embed_version_build], [@REVISION@]) -m4_define([embed_version_tag], [git]) +m4_define([embed_version_tag], []) m4_define([embed_version], [embed_version_major().embed_version_minor().embed_version_micro()ifelse(embed_version_nano(), [], [], [.embed_version_nano()])ifelse(embed_version_tag(), [git], [embed_version_tag()-embed_version_build()], [embed_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-embed-plugin-0.8.0
Updating annotated tag refs/tags/xfce4-embed-plugin-0.8.0 as new annotated tag to c100e92c66f3fe7e6b414045f71573e0c81f34ab (tag) tagged by David Schneider on 2012-02-05 10:27 +0100 Andrzej (1): Bug 8402 - Label orientation in panel 4.9+ Brian Tarricone (1): remove trailing parens on AC_INIT version info to work around bug David Schneider (33): Initial import from the sample panel plugin; interface skeleton. Added window enumeration. Added AND matching to search. Added embedding of the matched window. Added a "fake socket" to avoid destruction of the embedded window. Fixed breakage due to reparenting windows not on the current workspace Removed separator entry in the plugin struct. Added X11-based window monitoring and label formatting. Added lots of comments. Added configuration dialog and fixed popout window-destruction bugs. Updated TODO Added mnemonics to configuration dialog. Added "focus" menu item. Fixed destruction of embedded window when the plugin is destroyed. Removed about dialog; we don't need it. Vastly improved the configuration UI. Added label font customization. Launch configuration dialog when there are no settings. Added command launching, optionally with socket id. Added label clicking and improved GtkSocket+GtkPlug handling. Added samples and updated NEWS and THANKS. Now using stock icons for everything (plugin and menus) Tweak: If a window isn't embedded, and the min-size is 0, set it to -1. Added LIBX11 CFLAGS/LIBS to makefile to avoid linker issues. Removed ChangeLog. Added ChangeLog to .gitignore Fixed compatibility with GTK+ 2.20 Added X error trap for windows that are destroyed before we can check them. Using g_idle_add to avoid multiple searches when processing event backlogs Reworked configuration dialog code to make it readable. Fixed GTK errors when applying new search criteria after popping out. Debug message tweaks. 0.8.0 release Jérôme Guelfucci (8): Update copyright year. Update autogen.sh. Modernize configure.in.in and add git support. Rename configure file to new standard. Don't track INSTALL. Modernize the root Makefile.am. Fix ChangeLog generation. Port the plugin to libxfce4ui. Nick Schermer (8): * Base layout Import initial version of the sample plugin. Code is not finished, but the base files are finished. Remove this hidden file Stuff works now Set property svn:keyword Fix unblock problem * Improve version stuff Fix libtool build problem. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Replace text-column with file-column
Updating branch refs/heads/stephan/icon-bar
to a05f89d523b765e688ac955e79e1ec65df70d53a (commit)
from 1127e89f339a2e5722c97b85a7084574b400c1a8 (commit)
commit a05f89d523b765e688ac955e79e1ec65df70d53a
Author: Stephan Arts
Date: Sat Feb 4 13:07:56 2012 +0100
Replace text-column with file-column
src/icon_bar.c| 223 +++--
src/icon_bar.h|4 +-
src/image_list.c | 10 +--
src/main_window.c |2 +-
4 files changed, 53 insertions(+), 186 deletions(-)
diff --git a/src/icon_bar.c b/src/icon_bar.c
index 341f4b8..f557d2b 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -29,6 +29,10 @@
#include
+#include
+
+#include "util.h"
+#include "file.h"
#include "marshal.h"
#include "icon_bar.h"
@@ -70,7 +74,7 @@
* // create the icon bar
* bar = rstto_icon_bar_new_with_model (GTK_TREE_MODEL (store));
* rstto_icon_bar_set_pixbuf_column (RSTTO_ICON_BAR (bar), PIXBUF_COLUMN);
- * rstto_icon_bar_set_text_column (RSTTO_ICON_BAR (bar), TEXT_COLUMN);
+ * rstto_icon_bar_set_file_column (RSTTO_ICON_BAR (bar), FILE_COLUMN);
* gtk_widget_show (bar);
*
* // the icon bar keeps a reference on the store now
@@ -91,7 +95,7 @@
#define RSTTO_ICON_BAR_VALID_MODEL_AND_COLUMNS(obj) ((obj)->priv->model !=
NULL && \
(obj)->priv->pixbuf_column != -1 && \
-(obj)->priv->text_column != -1)
+(obj)->priv->file_column != -1)
@@ -102,7 +106,7 @@ enum
PROP_0,
PROP_ORIENTATION,
PROP_PIXBUF_COLUMN,
-PROP_TEXT_COLUMN,
+PROP_FILE_COLUMN,
PROP_MODEL,
PROP_ACTIVE,
PROP_SHOW_TEXT,
@@ -222,11 +226,6 @@ rstto_icon_bar_calculate_item_size (
RsttoIconBar *icon_bar,
RsttoIconBarItem *item);
-static void
-rstto_icon_bar_update_item_text (
-RsttoIconBar *icon_bar,
-RsttoIconBarItem *item);
-
static GdkPixbuf *
rstto_icon_bar_get_item_icon (
RsttoIconBar *icon_bar,
@@ -305,7 +304,7 @@ struct _RsttoIconBarPrivate
gintheight;
gintpixbuf_column;
-ginttext_column;
+gintfile_column;
RsttoIconBarItem *active_item;
RsttoIconBarItem *single_click_item;
@@ -401,18 +400,18 @@ rstto_icon_bar_class_init (RsttoIconBarClass *klass)
G_PARAM_READWRITE));
/**
- * RsttoIconBar:text-column:
+ * RsttoIconBar:file-column:
*
- * The ::text-column property contains the number of the model column
- * containing the texts which are displayed. The text column must be
- * of type #G_TYPE_STRING. If this property is set to -1, no texts
- * are displayed.
+ * The ::file-column property contains the number of the model column
+ * containing the files which are displayed. The text column must be
+ * of type #RSTTO_TYPE_FILE. If this property is set to -1, no
+ * details are displayed.
**/
g_object_class_install_property (gobject_class,
-PROP_TEXT_COLUMN,
-g_param_spec_int ("text-column",
-_("Text column"),
-_("Model column used to retrieve the text from"),
+PROP_FILE_COLUMN,
+g_param_spec_int ("file-column",
+_("File column"),
+_("Model column used to retrieve the file from"),
-1, G_MAXINT, -1,
G_PARAM_READWRITE));
@@ -550,7 +549,7 @@ rstto_icon_bar_init (RsttoIconBar *icon_bar)
icon_bar->priv->orientation = GTK_ORIENTATION_VERTICAL;
icon_bar->priv->pixbuf_column = -1;
-icon_bar->priv->text_column = -1;
+icon_bar->priv->file_column = -1;
icon_bar->priv->show_text = TRUE;
icon_bar->priv->auto_center = TRUE;
@@ -611,8 +610,8 @@ rstto_icon_bar_get_property (
g_value_set_int (value, icon_bar->priv->pixbuf_column);
break;
-case PROP_TEXT_COLUMN:
-g_value_set_int (value, icon_bar->priv->text_column);
+case PROP_FILE_COLUMN:
+g_value_set_int (value, icon_bar->priv->file_column);
break;
case PROP_MODEL:
@@ -654,8 +653,8 @@ rstto_icon_bar_set_property (
rstto_icon_bar_set_pixbuf_column (icon_bar, g_value_get_int
(value));
break;
-case PROP_TEXT_COLUMN:
-rstto_icon_bar_set_text_column (icon_bar, g_value_get_int (value));
+case PROP_FILE_COLUMN:
+rstto_icon_bar_set_file_column (icon_bar, g_value_get_int (value));
break;
case PROP_MODEL:
@@ -964,7 +963,7 @@ rstto_icon_bar_motion (
RsttoIconBar *icon_bar = RSTTO_ICON_BAR (widget);
GtkTreePath *path;
GtkTreeIter iter;
-gchar*text;
+RsttoFile*file;
item = rstto_icon_bar_get_item_at_pos (icon_bar, event->x, event->y);
if (item != NULL && icon_bar->priv->cursor_item != item)
@@ -976,15 +975,9 @@ rstto_icon_bar_motion (
[Xfce4-commits] Keep the thumbnails in memory for a while
Updating branch refs/heads/stephan/icon-bar
to fcf14bf68694998111cc10caece5f502bcc1227f (commit)
from 77f1395f227ccfb96cb317d0dac80b3cac76f755 (commit)
commit fcf14bf68694998111cc10caece5f502bcc1227f
Author: Stephan Arts
Date: Sun Feb 5 01:35:55 2012 +0100
Keep the thumbnails in memory for a while
src/file.c| 61 +
src/file.h|6 +
src/icon_bar.c| 365 -
src/icon_bar.h|4 -
src/image_list.c | 235 --
src/main_window.c |1 -
src/util.h|9 ++
7 files changed, 268 insertions(+), 413 deletions(-)
diff --git a/src/file.c b/src/file.c
index f7ec265..13e5df3 100644
--- a/src/file.c
+++ b/src/file.c
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
@@ -100,6 +101,9 @@ struct _RsttoFilePriv
gchar *uri;
gchar *path;
+gchar *thumbnail_path;
+GdkPixbuf *thumbnails[THUMBNAIL_SIZE_COUNT];
+
ExifData *exif_data;
RsttoImageOrientation orientation;
};
@@ -137,6 +141,7 @@ static void
rstto_file_dispose (GObject *object)
{
RsttoFile *file = RSTTO_FILE (object);
+gint i = 0;
if (file->priv)
{
@@ -160,12 +165,26 @@ rstto_file_dispose (GObject *object)
g_free (file->priv->path);
file->priv->path = NULL;
}
+if (file->priv->thumbnail_path)
+{
+g_free (file->priv->thumbnail_path);
+file->priv->thumbnail_path = NULL;
+}
if (file->priv->uri)
{
g_free (file->priv->uri);
file->priv->uri = NULL;
}
+for (i = 0; i < THUMBNAIL_SIZE_COUNT; ++i)
+{
+if (file->priv->thumbnails[i])
+{
+g_object_unref (file->priv->thumbnails[i]);
+file->priv->thumbnails[i] = NULL;
+}
+}
+
g_free (file->priv);
file->priv = NULL;
@@ -408,3 +427,45 @@ rstto_file_has_exif ( RsttoFile *file )
}
return TRUE;
}
+
+const gchar *
+rstto_file_get_thumbnail_path ( RsttoFile *file)
+{
+const gchar *uri;
+gchar *checksum;
+gchar *filename;
+
+if (NULL == file->priv->thumbnail_path)
+{
+uri = rstto_file_get_uri (file);
+checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, strlen
(uri));
+filename = g_strconcat (checksum, ".png", NULL);
+
+file->priv->thumbnail_path = g_build_path ("/", g_get_home_dir(),
".thumbnails", "normal", filename, NULL);
+
+g_free (checksum);
+g_free (filename);
+}
+
+return file->priv->thumbnail_path;
+}
+
+const GdkPixbuf *
+rstto_file_get_thumbnail ( RsttoFile *file , RsttoThumbnailSize size)
+{
+const gchar *thumbnail_path;
+
+if (file->priv->thumbnails[size])
+return file->priv->thumbnails[size];
+
+thumbnail_path = rstto_file_get_thumbnail_path (file);
+
+file->priv->thumbnails[size] = gdk_pixbuf_new_from_file_at_scale (
+thumbnail_path,
+rstto_thumbnail_size[size],
+rstto_thumbnail_size[size],
+TRUE,
+NULL);
+
+return file->priv->thumbnails[size];
+}
diff --git a/src/file.h b/src/file.h
index 467813a..2a667b4 100644
--- a/src/file.h
+++ b/src/file.h
@@ -83,6 +83,12 @@ rstto_file_get_uri ( RsttoFile * );
const gchar *
rstto_file_get_content_type ( RsttoFile * );
+const gchar *
+rstto_file_get_thumbnail_path ( RsttoFile *);
+
+const GdkPixbuf *
+rstto_file_get_thumbnail ( RsttoFile *, RsttoThumbnailSize );
+
guint64
rstto_file_get_modified_time ( RsttoFile *);
diff --git a/src/icon_bar.c b/src/icon_bar.c
index f557d2b..573524d 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -33,6 +33,7 @@
#include "util.h"
#include "file.h"
+#include "settings.h"
#include "marshal.h"
#include "icon_bar.h"
@@ -94,7 +95,6 @@
#define RSTTO_ICON_BAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),
RSTTO_TYPE_ICON_BAR, RsttoIconBarPrivate))
#define RSTTO_ICON_BAR_VALID_MODEL_AND_COLUMNS(obj) ((obj)->priv->model !=
NULL && \
-(obj)->priv->pixbuf_column != -1 && \
(obj)->priv->file_column != -1)
@@ -105,7 +105,6 @@ enum
{
PROP_0,
PROP_ORIENTATION,
-PROP_PIXBUF_COLUMN,
PROP_FILE_COLUMN,
PROP_MODEL,
PROP_ACTIVE,
@@ -118,7 +117,7 @@ enum
LAST_SIGNAL,
};
-
+static GdkPixbuf *thumbnail_missing = NULL;
static void
rstto_icon_bar_destroy (GtkObject *object);
@@ -241,6 +240,16 @@ rstto_icon_bar_adjustment_value_changed (
RsttoIconBar *icon_bar,
GtkAdjustment *adjustment);
+static void
+cb_rstto_thumbnail_size_changed (
+GObject *settings,
+GParamSpec *pspec,
+gpointer user_data);
+
+static void
+rstto_icon_bar_update_missing_icon (RsttoIconBar *icon_bar);
+
+
static RsttoIconBarItem *
rstto_icon_bar_item_new (void);
@@ -317,6 +326,10 @@ struct _RsttoIconBarPrivate
[Xfce4-commits] Deleting branch stephan/icon-bar
Deleting branch refs/heads/stephan/icon-bar ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add missing Makefile
Updating branch refs/heads/master
to 10843899d9319355be304a82a60d974fc4d4e9c3 (commit)
from 06c6a4c87aeeaeedfd44eb6d23bf48db3c63a9d8 (commit)
commit 10843899d9319355be304a82a60d974fc4d4e9c3
Author: Stephan Arts
Date: Sun Feb 5 11:27:58 2012 +0100
Add missing Makefile
icons/{48x48 => 128x128}/Makefile.am |0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/icons/48x48/Makefile.am b/icons/128x128/Makefile.am
similarity index 100%
copy from icons/48x48/Makefile.am
copy to icons/128x128/Makefile.am
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Greek (el) translation to None%
Updating branch refs/heads/xfce-4.8 to 6922bea428d4e1081b1a3000509a8e717dee6044 (commit) from 939bbe57f4e74a1d59b93d42cee3621fe52582f0 (commit) commit 6922bea428d4e1081b1a3000509a8e717dee6044 Author: Basilis Thomopoulos Date: Sun Feb 5 12:34:12 2012 +0100 l10n: Updated Greek (el) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/el.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/po/el.po b/doc/manual/po/el.po index 989b423..78080cd 100644 --- a/doc/manual/po/el.po +++ b/doc/manual/po/el.po @@ -726,9 +726,9 @@ msgid "" "the system defaults will be used." msgstr "" "Αν τα εικονίδια επιφάνειας εργασίας είναι ενεργοποιημένα, μπορείτε να ελέγχετε " -"το μέγθος του εικονιδίου (σε πίξελς) με την επιλογή \"Μέγεθος " +"το μέγεθος του εικονιδίου (σε πίξελς) με την επιλογή \"Μέγεθος " "εικονιδίου\", καθώς και το μέγεθος γραμματοσειράς που χρησιμοποιείται " -"για νε εμφανίζεται το κείμενο του εικονιδίου (σε σημεία), με την επιλογή ' +"για να εμφανίζεται το κείμενο του εικονιδίου (σε σημεία), με την επιλογή " "\"Χρήση προσαρμοσμένου μεγέθους γραμματοσειράς\"." "Αν δεν τσεκάρετε την τελευταία επιλογή, θα χρησιμοποιηθούν οι προεπιλογές " "του συστήματος." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated German (de) translation to 100%
Updating branch refs/heads/master to 41a38221bc876465b477a6bd014dca12441fa590 (commit) from c1f09a1dd3479ca9f433143c9f3a4b3e3c3cdece (commit) commit 41a38221bc876465b477a6bd014dca12441fa590 Author: Fabian Nowak Date: Sun Feb 5 13:22:04 2012 +0100 l10n: Updated German (de) translation to 100% New status: 110 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 187 -- 1 files changed, 134 insertions(+), 53 deletions(-) diff --git a/po/de.po b/po/de.po index d68c893..37ff162 100644 --- a/po/de.po +++ b/po/de.po @@ -9,13 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-15 22:43-0700\n" +"POT-Creation-Date: 2012-02-05 08:24+\n" "PO-Revision-Date: 2008-11-03 21:36+0100\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204 @@ -27,13 +28,23 @@ msgstr "TLS-Verbindungsaufbau fehlgeschlagen: %s" #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255 #, c-format -msgid "Received HTTP response code %d. The most likely reason for this is that your GMail username or password is incorrect." -msgstr "HTTP-Antwort %d erhalten. Wahrscheinlich ist Ihr GoogleMail Passwort oder Benutzername inkorrekt." +msgid "" +"Received HTTP response code %d. The most likely reason for this is that " +"your GMail username or password is incorrect." +msgstr "" +"HTTP-Antwort %d erhalten. Wahrscheinlich ist Ihr GoogleMail Passwort oder " +"Benutzername inkorrekt." #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261 #, c-format -msgid "Received HTTP response code %d, which should be 200. There may be a problem with GMail's servers, or they have incompatibly changed their authentication method or location of the new messages feed." -msgstr "HTTP-Antwort %d erhalten, welche eigentlich 200 sein sollte. Wahrscheinlich gibt es Probleme mit den GoogleMail Servern (Änderung des Loginvorgangs, Verschiebung der Seite mit den Informationen über neue Nachrichten)." +msgid "" +"Received HTTP response code %d, which should be 200. There may be a problem " +"with GMail's servers, or they have incompatibly changed their authentication " +"method or location of the new messages feed." +msgstr "" +"HTTP-Antwort %d erhalten, welche eigentlich 200 sein sollte. Wahrscheinlich " +"gibt es Probleme mit den GoogleMail Servern (Änderung des Loginvorgangs, " +"Verschiebung der Seite mit den Informationen über neue Nachrichten)." #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:735 @@ -42,7 +53,8 @@ msgstr "HTTP-Antwort %d erhalten, welche eigentlich 200 sein sollte. Wahrscheinl #: ../libmailwatch-core/mailwatch-mailbox-mh.c:487 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548 msgid "Previous thread hasn't exited yet, not checking mail this time." -msgstr "Der vorherige Thread ist noch nicht beendet, prüfe diesmal keine E-Mail." +msgstr "" +"Der vorherige Thread ist noch nicht beendet, prüfe diesmal keine E-Mail." #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748 @@ -60,12 +72,12 @@ msgstr "_Passwort:" #: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915 msgid "Check for _new messages every" -msgstr "Prüfung nach _neuen Nachrichten im Intervall" +msgstr "Prüfung nach _neuen Nachrichten im Intervall:" #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821 #: ../libmailwatch-core/mailwatch-mailbox-maildir.c:374 -#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:411 +#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:412 #: ../libmailwatch-core/mailwatch-mailbox-mh.c:605 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929 msgid "minute(s)." @@ -76,23 +88,35 @@ msgid "Remote GMail Mailbox" msgstr "Entferntes GoogleMail-Postfach" #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669 -msgid "The GMail plugin can connect to Google's mail service and securely retrieve the number of new messages." -msgstr "Das GoogleMail Plugin kann sich mit Google verbinden und über eine sichere Verbindung die Anzahl der neuen Nachrichten herausfinden." +msgid "" +"The GMail plugin can connect to Google's mail service and securely retrieve " +"the number of new messages." +msgstr "" +"Das GoogleMail Plugin kann sich mit Google verbinden und über eine sichere " +"Verbindung die Anzahl der neuen Nachrichten herausfinden." #: ../libmailwatch-core/mailwatch-mailbox-imap.c:286 -msgid "Secure IMAP is not available, and the IMAP se
[Xfce4-commits] WIP: Make the properties dialog work.
Updating branch refs/heads/nick/settings-editor
to 46204e9a5abf36dd12a55de22a0cb5e831f377d6 (commit)
from 06c13c07a9823f3a501f013e0498a7cf7f21adc5 (commit)
commit 46204e9a5abf36dd12a55de22a0cb5e831f377d6
Author: Nick Schermer
Date: Sun Feb 5 00:07:59 2012 +0100
WIP: Make the properties dialog work.
.../xfce-settings-editor-dialog.c | 77 +++--
xfce4-settings-editor/xfce-settings-prop-dialog.c | 310
2 files changed, 308 insertions(+), 79 deletions(-)
diff --git a/xfce4-settings-editor/xfce-settings-editor-dialog.c
b/xfce4-settings-editor/xfce-settings-editor-dialog.c
index 75a3126..318c36c 100644
--- a/xfce4-settings-editor/xfce-settings-editor-dialog.c
+++ b/xfce4-settings-editor/xfce-settings-editor-dialog.c
@@ -610,14 +610,15 @@ xfce_settings_editor_dialog_property_changed
(XfconfChannel*channel,
const GValue *value,
XfceSettingsEditorDialog *dialog)
{
-GtkTreePath *path = NULL;
-DeleteContext *context;
-GtkTreeIterchild_iter;
-GtkTreeModel *model;
-GValue parent_val = { 0, };
-GtkTreeIterparent_iter;
-gboolean empty_prop;
-gboolean has_parent;
+GtkTreePath *path = NULL;
+DeleteContext*context;
+GtkTreeIter child_iter;
+GtkTreeModel *model;
+GValueparent_val = { 0, };
+GtkTreeIter parent_iter;
+gboolean empty_prop;
+gboolean has_parent;
+GtkTreeSelection *selection;
g_return_if_fail (GTK_IS_TREE_STORE (dialog->props_store));
g_return_if_fail (XFCONF_IS_CHANNEL (channel));
@@ -648,30 +649,44 @@ xfce_settings_editor_dialog_property_changed
(XfconfChannel*channel,
{
if (gtk_tree_model_get_iter (model, &child_iter, context->path))
{
-/* delete the value */
-has_parent = gtk_tree_model_iter_parent (model, &parent_iter,
&child_iter);
-gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter);
-
-/* remove the parent nodes if they are empty */
-while (has_parent)
+if (gtk_tree_model_iter_has_child (model, &child_iter))
{
-/* if the parent still has children, stop cleaning */
-if (gtk_tree_model_iter_has_child (model, &parent_iter))
-break;
-
-/* maybe the parent has a value */
-gtk_tree_model_get_value (model, &parent_iter,
PROP_COLUMN_FULL, &parent_val);
-empty_prop = g_value_get_string (&parent_val) == NULL;
-g_value_unset (&parent_val);
-
-/* nope it points to a real xfconf property */
-if (!empty_prop)
-break;
-
-/* get the parent and remove the empty row */
-child_iter = parent_iter;
+/* the node has children, so only unset it */
+gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+PROP_COLUMN_FULL, NULL,
+PROP_COLUMN_TYPE, NULL,
+PROP_COLUMN_TYPE_NAME, _("Empty"),
+PROP_COLUMN_LOCKED, FALSE,
+PROP_COLUMN_VALUE, NULL,
+-1);
+}
+else
+{
+/* delete the node */
has_parent = gtk_tree_model_iter_parent (model,
&parent_iter, &child_iter);
gtk_tree_store_remove (GTK_TREE_STORE (model),
&child_iter);
+
+/* remove the parent nodes if they are empty */
+while (has_parent)
+{
+/* if the parent still has children, stop cleaning */
+if (gtk_tree_model_iter_has_child (model,
&parent_iter))
+break;
+
+/* maybe the parent has a value */
+gtk_tree_model_get_value (model, &parent_iter,
PROP_COLUMN_FULL, &parent_val);
+empty_prop = g_value_get_string (&parent_val) == NULL;
+g_value_unset (&parent_val);
+
+/* nope it points to a real xfconf property */
+if (!empty_prop)
+break;
+
+/* get the parent and remove the empty row */
+child_iter = parent_iter;
+has_parent = gtk_tree_model_iter_parent (model,
&parent_iter, &child_iter);
+gtk_tree_store_remove (GTK_TREE_STORE (model),
&chi
[Xfce4-commits] Deleting branch nick/settings-editor
Deleting branch refs/heads/nick/settings-editor ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to a0813f577935afdf338e9fd38d6cd0b60bcbbf8e (commit) from 10843899d9319355be304a82a60d974fc4d4e9c3 (commit) commit a0813f577935afdf338e9fd38d6cd0b60bcbbf8e Author: Pjotr Anon Date: Sun Feb 5 17:50:36 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 142 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 241 +++--- 1 files changed, 135 insertions(+), 106 deletions(-) diff --git a/po/nl.po b/po/nl.po index fe17fd1..7879007 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the ristretto package. # Stephan Arts , 2007. # Pjotr, 2011. -# +# msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2012-01-11 13:12+\n" +"POT-Creation-Date: 2012-02-05 12:24+\n" "PO-Revision-Date: 2011-09-08 00:48+0200\n" "Last-Translator: Pjotr\n" "Language-Team: Dutch (Flemish)\n" -"Language: nl (Dutch)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl (Dutch)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/main.c:61 @@ -45,271 +45,307 @@ msgstr "" "%s: %s\n" "Probeer %s --help voor een lijst van beschikbare opdrachtregelopties.\n" -#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "Afbeeldingkijker" #. File Menu -#: ../src/main_window.c:311 +#: ../src/main_window.c:328 msgid "_File" msgstr "_Bestand" -#: ../src/main_window.c:312 +#: ../src/main_window.c:329 msgid "_Open" msgstr "_Open" -#: ../src/main_window.c:312 +#: ../src/main_window.c:329 msgid "Open an image" msgstr "Afbeelding openen" -#: ../src/main_window.c:313 +#: ../src/main_window.c:330 msgid "_Save copy" msgstr "Kopie op_slaan" -#: ../src/main_window.c:313 +#: ../src/main_window.c:330 msgid "Save a copy of the image" msgstr "Sla een kopie van de afbeelding op" -#: ../src/main_window.c:314 +#: ../src/main_window.c:331 msgid "_Properties" msgstr "Eigenschappen" -#: ../src/main_window.c:314 +#: ../src/main_window.c:331 msgid "Show file properties" msgstr "Toon bestandeigenschappen" -#: ../src/main_window.c:315 +#: ../src/main_window.c:332 msgid "_Close" msgstr "_Sluiten" -#: ../src/main_window.c:315 +#: ../src/main_window.c:332 msgid "Close this image" msgstr "Sluit deze afbeelding" -#: ../src/main_window.c:316 +#: ../src/main_window.c:333 msgid "_Quit" msgstr "_Afsluiten" -#: ../src/main_window.c:316 +#: ../src/main_window.c:333 msgid "Quit Ristretto" msgstr "Ristretto sluiten" #. Edit Menu -#: ../src/main_window.c:318 +#: ../src/main_window.c:335 msgid "_Edit" msgstr "Be_werken" -#: ../src/main_window.c:319 +#: ../src/main_window.c:336 msgid "_Open with..." msgstr "_Openen met..." -#: ../src/main_window.c:320 +#: ../src/main_window.c:337 msgid "_Sorting" msgstr "_Sorteren" -#: ../src/main_window.c:321 +#: ../src/main_window.c:338 msgid "_Delete" msgstr "_Verwijderen" -#: ../src/main_window.c:321 +#: ../src/main_window.c:338 msgid "Delete this image from disk" msgstr "Verwijder deze afbeelding van de schijf" -#: ../src/main_window.c:322 +#: ../src/main_window.c:339 msgid "_Clear private data" msgstr "Verwijder privégegevens" -#: ../src/main_window.c:323 +#: ../src/main_window.c:340 msgid "_Preferences" msgstr "_Voorkeuren" #. View Menu -#: ../src/main_window.c:325 +#: ../src/main_window.c:342 msgid "_View" msgstr "Beel_d" -#: ../src/main_window.c:326 +#: ../src/main_window.c:343 msgid "_Fullscreen" msgstr "_Volledig scherm" -#: ../src/main_window.c:327 +#: ../src/main_window.c:344 msgid "_Leave Fullscreen" msgstr "_Volledig scherm sluiten" -#: ../src/main_window.c:328 +#: ../src/main_window.c:345 msgid "_Set as Wallpaper" msgstr "In_stellen als bureaubladachtergrond" #. Zoom submenu -#: ../src/main_window.c:330 +#: ../src/main_window.c:347 msgid "_Zoom" msgstr "_Zoomen" -#: ../src/main_window.c:331 +#: ../src/main_window.c:348 msgid "Zoom _In" msgstr "_Inzoomen" -#: ../src/main_window.c:332 +#: ../src/main_window.c:349 msgid "Zoom _Out" msgstr "_Uitzoomen" -#: ../src/main_window.c:333 +#: ../src/main_window.c:350 msgid "Zoom _Fit" msgstr "_Passend maken" -#: ../src/main_window.c:334 +#: ../src/main_window.c:351 msgid "_Normal Size" msgstr "_Normale grootte" #. Rotation submenu -#: ../src/main_window.c:336 +#: ../src/main_window.c:353 msgid "_Rotation" msgstr "_Draaiing" -#: ../src/main_window.c:337 +#: ../src/main_window.c:354 msgid "Rotate _Right" msgstr "_Rechtsom draaien" -#: ../src/main_window.c:338 +#: ../src/main_window.c:355 msgid "Rotate _Left" msgstr "_Linksom draaien" #. Go Menu -#: ../src/
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master
to 0a86bfe56f2a551b4729d2c3d4af783baa56db02 (commit)
from 2e0bf850a344a43efd3728dff70454895acf3b8e (commit)
commit 0a86bfe56f2a551b4729d2c3d4af783baa56db02
Author: Pjotr Anon
Date: Sun Feb 5 17:56:00 2012 +0100
l10n: Updated Dutch (Flemish) (nl) translation to 100%
New status: 330 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/nl.po | 274 --
1 files changed, 159 insertions(+), 115 deletions(-)
diff --git a/po/nl.po b/po/nl.po
index e608b2f..ff8e34b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-settings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-27 10:54+\n"
+"POT-Creation-Date: 2012-02-05 15:18+\n"
"PO-Revision-Date: 2011-09-08 22:32+0200\n"
"Last-Translator: Pjotr\n"
"Language-Team: Dutch (Flemish)\n"
@@ -1314,174 +1314,206 @@ msgstr "Ro_tatie:"
msgid "_Sensitivity:"
msgstr "_Gevoeligheid:"
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Instellingenbewerker voor Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Bewerk door Xfconf opgeslagen instellingen"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
msgid "Channel"
msgstr "Kanaal"
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
msgid "Property"
msgstr "Eigenschap"
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
msgid "Type"
msgstr "Type"
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
msgid "Locked"
msgstr "Vergrendeld"
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
msgid "Value"
msgstr "Waarde"
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Leeg"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nieuwe eigenschap"
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Dit is een ongeldige naam van een eigenschap."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Gekozen eigenschap bewerken"
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Opnieuw instellen"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Opnieuw instellen"
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"Het terugzetten van een eigenschap op de standaardwaarden, zal deze "
-"aangepaste instellingen permanent verwijderen."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Gekozen eigenschap terugzetten op standaardwaarden"
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Weet u zeker dat u de eigenschap \"%s\" opnieuw wilt instellen?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Leeg"
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Namen van eigenschappen moeten beginnen met een '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Reeks"
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Het root-element ('/') is geen geldige naam voor een eigenschap"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Tekstsnoer"
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Namen van eigenschappen mogen alleen bestaan uit de tekens A-Z, a-z, 0-9, "
-"'_', '-', '<' en '>', en '/' als scheidingsteke
[Xfce4-commits] Bug 7077: Install plugin to lib instead of libexec.
Updating branch refs/heads/master to 608e7087b8ee461dd6e8b823df4595cac568499d (commit) from 97694efd28d30261f120fb7be61b54e6beb8e5da (commit) commit 608e7087b8ee461dd6e8b823df4595cac568499d Author: cjsthompson Date: Sun Feb 5 12:20:42 2012 -0800 Bug 7077: Install plugin to lib instead of libexec. panel-plugin/Makefile.am |4 ++-- panel-plugin/systemload.desktop.in.in |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index f58f1e8..9396445 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ $(PLATFORM_CPPFLAGS) plugindir =\ - $(libexecdir)/xfce4/panel-plugins + $(libdir)/xfce4/panel/plugins plugin_PROGRAMS = \ xfce4-systemload-plugin @@ -46,7 +46,7 @@ desktop_in_files = \ $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ + sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ desktop_DATA = \ $(desktop_in_files:.desktop.in=.desktop) diff --git a/panel-plugin/systemload.desktop.in.in b/panel-plugin/systemload.desktop.in.in index b79b605..74d4bfa 100644 --- a/panel-plugin/systemload.desktop.in.in +++ b/panel-plugin/systemload.desktop.in.in @@ -4,5 +4,5 @@ Encoding=UTF-8 _Name=System Load Monitor _Comment=Monitor CPU load, swap usage and memory footprint Icon=utilities-system-monitor -X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-systemload-plugin +X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-systemload-plugin ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Cache header icons and avoid large icons.
Updating branch refs/heads/master
to 97f92b7a560c43da19dc9a84957f88c26b7abc53 (commit)
from 2ba8e3f69853c20b63d130cb9f367f7d7b05914f (commit)
commit 97f92b7a560c43da19dc9a84957f88c26b7abc53
Author: Nick Schermer
Date: Sun Feb 5 21:21:07 2012 +0100
Cache header icons and avoid large icons.
Sometimes larger icons then 48x48 were returned by gtk,
avoid this can scale down the icons if this is the case.
Also cache icon-name loaded icons, those were reloaded twice
each size req/alloc (oops).
libxfce4ui/xfce-heading.c | 49 +++-
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/libxfce4ui/xfce-heading.c b/libxfce4ui/xfce-heading.c
index df29216..064becc 100644
--- a/libxfce4ui/xfce-heading.c
+++ b/libxfce4ui/xfce-heading.c
@@ -339,6 +339,7 @@ _xfce_heading_make_pixbuf (XfceHeading *heading)
GtkIconTheme *icon_theme;
GdkPixbuf*pixbuf = NULL;
GdkScreen*screen;
+ GdkPixbuf*scaled;
if (G_UNLIKELY (heading->icon != NULL))
{
@@ -355,6 +356,27 @@ _xfce_heading_make_pixbuf (XfceHeading *heading)
pixbuf = gtk_icon_theme_load_icon (icon_theme, heading->icon_name,
XFCE_HEADING_ICON_SIZE,
GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+ if (pixbuf != NULL
+ && (gdk_pixbuf_get_height (pixbuf) > XFCE_HEADING_ICON_SIZE
+ || gdk_pixbuf_get_width (pixbuf) > XFCE_HEADING_ICON_SIZE))
+{
+ /* this doesn't happen often, so be stupid
+ * and assume icons are always squared */
+ scaled = gdk_pixbuf_scale_simple (pixbuf,
+XFCE_HEADING_ICON_SIZE,
+XFCE_HEADING_ICON_SIZE,
+GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+ pixbuf = scaled;
+}
+
+ /* cache the icon, this does not take theme changes in account,
+ * but because of the only use in the titled dialog, this works
+ * fine, since the window properties are emitted on icon changes */
+ if (heading->icon == NULL
+ && pixbuf != NULL)
+heading->icon = g_object_ref (pixbuf);
}
return pixbuf;
@@ -385,12 +407,27 @@ _xfce_heading_set_icon (XfceHeading *heading,
if (G_LIKELY (heading->icon != NULL))
g_object_unref (G_OBJECT (heading->icon));
- /* activate the new icon */
- heading->icon = icon;
-
- /* connect to the new icon */
- if (G_LIKELY (icon != NULL))
-g_object_ref (G_OBJECT (icon));
+ if (icon != NULL)
+{
+ if (gdk_pixbuf_get_height (icon) > XFCE_HEADING_ICON_SIZE
+ || gdk_pixbuf_get_width (icon) > XFCE_HEADING_ICON_SIZE)
+{
+ /* this doesn't happen often, so be stupid
+ * and assume icons are always squared */
+ heading->icon = gdk_pixbuf_scale_simple (icon,
+ XFCE_HEADING_ICON_SIZE,
+ XFCE_HEADING_ICON_SIZE,
+ GDK_INTERP_BILINEAR);
+}
+ else
+{
+ heading->icon = g_object_ref (icon);
+}
+}
+ else
+{
+ heading->icon = NULL;
+}
gtk_widget_queue_resize (GTK_WIDGET (heading));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 3258a6c709cea110fa1fedb479135e37a9990272 (commit) from a0813f577935afdf338e9fd38d6cd0b60bcbbf8e (commit) commit 3258a6c709cea110fa1fedb479135e37a9990272 Author: Yarema aka Knedlyk Date: Mon Feb 6 00:06:14 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 142 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 237 +++--- 1 files changed, 133 insertions(+), 104 deletions(-) diff --git a/po/uk.po b/po/uk.po index ffb2f9b..098b800 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n" -"POT-Creation-Date: 2012-01-09 09:27+\n" +"POT-Creation-Date: 2012-02-05 18:12+\n" "PO-Revision-Date: 2008-11-17 11:15+0200\n" "Last-Translator: Dmitry Nikitin \n" "Language-Team: Ukrainian \n" @@ -44,271 +44,307 @@ msgstr "" "Спробуйте %s --help для перегляду повного списку параметрів командної " "стрічки.\n" -#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:53 ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "Переглядач зображень" #. File Menu -#: ../src/main_window.c:316 +#: ../src/main_window.c:328 msgid "_File" msgstr "_Файл" -#: ../src/main_window.c:317 +#: ../src/main_window.c:329 msgid "_Open" msgstr "_Відкрити" -#: ../src/main_window.c:317 +#: ../src/main_window.c:329 msgid "Open an image" msgstr "Відкрити зображення" -#: ../src/main_window.c:318 +#: ../src/main_window.c:330 msgid "_Save copy" msgstr "Зберегти коп_ію" -#: ../src/main_window.c:318 +#: ../src/main_window.c:330 msgid "Save a copy of the image" msgstr "Зберегти копію малюнка" -#: ../src/main_window.c:319 +#: ../src/main_window.c:331 msgid "_Properties" msgstr "_Властивості" -#: ../src/main_window.c:319 +#: ../src/main_window.c:331 msgid "Show file properties" msgstr "Показати властивості файлу" -#: ../src/main_window.c:320 +#: ../src/main_window.c:332 msgid "_Close" msgstr "_Закрити" -#: ../src/main_window.c:320 +#: ../src/main_window.c:332 msgid "Close this image" msgstr "Закрити малюнок" -#: ../src/main_window.c:321 +#: ../src/main_window.c:333 msgid "_Quit" msgstr "Ви_йти" -#: ../src/main_window.c:321 +#: ../src/main_window.c:333 msgid "Quit Ristretto" msgstr "Вийти з Ristretto" #. Edit Menu -#: ../src/main_window.c:323 +#: ../src/main_window.c:335 msgid "_Edit" msgstr "_Редагувати" -#: ../src/main_window.c:324 +#: ../src/main_window.c:336 msgid "_Open with..." msgstr "_Відкрити з..." -#: ../src/main_window.c:325 +#: ../src/main_window.c:337 msgid "_Sorting" msgstr "_Сортування" -#: ../src/main_window.c:326 +#: ../src/main_window.c:338 msgid "_Delete" msgstr "_Видалити" -#: ../src/main_window.c:326 +#: ../src/main_window.c:338 msgid "Delete this image from disk" msgstr "Вилучити малюнок з диску" -#: ../src/main_window.c:327 +#: ../src/main_window.c:339 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../src/main_window.c:328 +#: ../src/main_window.c:340 msgid "_Preferences" msgstr "_Налаштування" #. View Menu -#: ../src/main_window.c:330 +#: ../src/main_window.c:342 msgid "_View" msgstr "_Перегляд" -#: ../src/main_window.c:331 +#: ../src/main_window.c:343 msgid "_Fullscreen" msgstr "Повний екр_ан" -#: ../src/main_window.c:332 +#: ../src/main_window.c:344 msgid "_Leave Fullscreen" msgstr "Покинути повний ек_ран" -#: ../src/main_window.c:333 +#: ../src/main_window.c:345 msgid "_Set as Wallpaper" msgstr "Встановити як шпа_лери" #. Zoom submenu -#: ../src/main_window.c:335 +#: ../src/main_window.c:347 msgid "_Zoom" msgstr "_Масштаб" -#: ../src/main_window.c:336 +#: ../src/main_window.c:348 msgid "Zoom _In" msgstr "Збіль_шити" -#: ../src/main_window.c:337 +#: ../src/main_window.c:349 msgid "Zoom _Out" msgstr "З_меншити" -#: ../src/main_window.c:338 +#: ../src/main_window.c:350 msgid "Zoom _Fit" msgstr "Вмістити у вікн_о" -#: ../src/main_window.c:339 +#: ../src/main_window.c:351 msgid "_Normal Size" msgstr "_Нормальний розмір" #. Rotation submenu -#: ../src/main_window.c:341 +#: ../src/main_window.c:353 msgid "_Rotation" msgstr "_Обертання" -#: ../src/main_window.c:342 +#: ../src/main_window.c:354 msgid "Rotate _Right" msgstr "Повернути в_право" -#: ../src/main_window.c:343 +#: ../src/main_window.c:355 msgid "Rotate _Left" msgstr "Повернути в_ліво" #. Go Menu -#: ../src/main_window.c:345 +#: ../src/main_window.c:357 msgid "_Go" msgstr "П_ерейти" -#: ../src/main_window.c:346 +#: ../src/main_window.c:358 msgid "_Forward" msgstr "_Вперед" -#: ../src/main_window.c:347 +#: ../src/main_window.c:359 msgid "_Back" msgstr "_Назад" -#: ../src/main_window.c:348 +#: ../src/main_window.c:360 msgid "_First" msgstr "_Перший" -#: ../src/main_win
[Xfce4-commits] l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 502cc521ca2d0be25dc5de2e0006f3a14a797cb5 (commit) from 0a86bfe56f2a551b4729d2c3d4af783baa56db02 (commit) commit 502cc521ca2d0be25dc5de2e0006f3a14a797cb5 Author: Yarema aka Knedlyk Date: Mon Feb 6 00:09:19 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 330 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 260 -- 1 files changed, 152 insertions(+), 108 deletions(-) diff --git a/po/uk.po b/po/uk.po index 02dca38..9278a76 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-settings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-02 17:42+\n" +"POT-Creation-Date: 2012-02-05 21:06+\n" "PO-Revision-Date: 2009-01-26 16:20+0200\n" "Last-Translator: Dmitry Nikitin \n" "Language-Team: Ukrainian \n" @@ -1299,62 +1299,176 @@ msgstr "Об_ертання:" msgid "_Sensitivity:" msgstr "_Чутливість:" -#: ../xfce4-settings-editor/main_window.c:157 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184 +#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2 +msgid "Settings Editor" +msgstr "Редактор параметрів" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185 +msgid "Customize settings stored by Xfconf" +msgstr "Упорядкувати властивості збережені через Xfconf" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230 msgid "Channel" msgstr "Канал" -#: ../xfce4-settings-editor/main_window.c:170 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264 msgid "Property" msgstr "Властивість" -#: ../xfce4-settings-editor/main_window.c:173 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271 msgid "Type" msgstr "Тип" -#: ../xfce4-settings-editor/main_window.c:176 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278 msgid "Locked" msgstr "Заблоковано" -#: ../xfce4-settings-editor/main_window.c:179 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285 msgid "Value" msgstr "Значення" -#: ../xfce4-settings-editor/main_window.c:310 -#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302 +msgid "New property" +msgstr "Нова властивість" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313 +msgid "Edit selected property" +msgstr "Редагувати вибрану властивість" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369 +msgid "_Reset" +msgstr "_Відновити" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324 +msgid "Reset selected property" +msgstr "Відновити вибрану властивість" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658 +#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90 msgid "Empty" msgstr "Пусто" -#: ../xfce4-settings-editor/main_window.c:698 -#: ../xfce4-settings-editor/main_window.c:890 -msgid "This property name is not valid." -msgstr "Назва властивості неправильна." +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451 +msgid "Array" +msgstr "Масив" -#: ../xfce4-settings-editor/main_window.c:925 -#: ../xfce4-settings-editor/main_window.c:1078 -msgid "Reset" -msgstr "Відновити" +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456 +#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91 +msgid "String" +msgstr "Рядок" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464 +msgid "Integer" +msgstr "Ціле" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467 +#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92 +msgid "Boolean" +msgstr "Двійковий" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470 +#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94 +msgid "Double" +msgstr "Подвійний" -#: ../xfce4-settings-editor/main_window.c:926 +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804 +msgid "_Reset Channel" +msgstr "_Відновити Канал" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805 +msgid "Resetting a channel will permanently remove those custom settings." +msgstr "Відновлення каналу повністю видалить встановлені параметри." + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806 +#, c-format +msgid "Are you sure you want to reset channel \"%s\" and all its properties?" +msgstr "Ви впевнені, що хочете відновити канал \"%s\" і всі його властивості?" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881 +msgid "reset" +msgstr "відновити" + +#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938 +#, c-format +msgid "Monitor %s" +msgstr "Монітор
[Xfce4-commits] Version bump after release
Updating branch refs/heads/master to dc994c65d675b4a00288bd70355731e8117db8a4 (commit) from 2d9f412a5622b79896697c1c16a26fd120baad63 (commit) commit dc994c65d675b4a00288bd70355731e8117db8a4 Author: David Schneider Date: Sun Feb 5 02:35:44 2012 -0800 Version bump after release configure.ac.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 6dda273..37c99f0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,11 +9,11 @@ dnl *** dnl *** Version information *** dnl *** m4_define([embed_version_major], [0]) -m4_define([embed_version_minor], [8]) +m4_define([embed_version_minor], [9]) m4_define([embed_version_micro], [0]) m4_define([embed_version_nano], []) dnl leave this empty to have no nano version m4_define([embed_version_build], [@REVISION@]) -m4_define([embed_version_tag], []) +m4_define([embed_version_tag], [git]) m4_define([embed_version], [embed_version_major().embed_version_minor().embed_version_micro()ifelse(embed_version_nano(), [], [], [.embed_version_nano()])ifelse(embed_version_tag(), [git], [embed_version_tag()-embed_version_build()], [embed_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Install plugin to lib instead of libexec.
Updating branch refs/heads/master to df30dc4092cd9c97fa5b4a68fc5d5e0dd2ea97fa (commit) from dc994c65d675b4a00288bd70355731e8117db8a4 (commit) commit df30dc4092cd9c97fa5b4a68fc5d5e0dd2ea97fa Author: David Schneider Date: Sun Feb 5 12:22:15 2012 -0800 Install plugin to lib instead of libexec. panel-plugin/Makefile.am |6 +++--- panel-plugin/embed.desktop.in.in |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 1476008..f194f81 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -11,7 +11,7 @@ plugin_PROGRAMS = \ xfce4-embed-plugin plugindir = \ - $(libexecdir)/xfce4/panel-plugins + $(libdir)/xfce4/panel/plugins xfce4_embed_plugin_SOURCES = \ embed.c \ @@ -38,7 +38,7 @@ xfce4_embed_plugin_LDADD = \ # Desktop file # desktopdir = \ - $(datadir)/xfce4/panel-plugins + $(datadir)/xfce4/panel/plugins desktop_in_in_files = \ embed.desktop.in.in @@ -47,7 +47,7 @@ desktop_in_files = \ $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ + sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ desktop_DATA = \ $(desktop_in_files:.desktop.in=.desktop) diff --git a/panel-plugin/embed.desktop.in.in b/panel-plugin/embed.desktop.in.in index ad48bd7..f7bc5fe 100644 --- a/panel-plugin/embed.desktop.in.in +++ b/panel-plugin/embed.desktop.in.in @@ -4,4 +4,4 @@ Encoding=UTF-8 _Name=Embed Plugin _Comment=Embeds an arbitrary window into the panel Icon=xfce4-panel -X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-embed-plugin +X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-embed-plugin ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Launcher plugin: small=FALSE in deskbar mode with label visible.
Updating branch refs/heads/andrzejr/deskbar2
to 13cfa4cc7b5612af43f7a8eb2d2bcb8c60c5f9d3 (commit)
from a7c42bbab812edf1c3df3e9fe7a62c3a8ef393f4 (commit)
commit 13cfa4cc7b5612af43f7a8eb2d2bcb8c60c5f9d3
Author: Andrzej
Date: Mon Feb 6 11:57:04 2012 +0900
Launcher plugin: small=FALSE in deskbar mode with label visible.
Regression fix. This error has been triggered by commit:
f362692 panel-itembar: Removed item size checks.
This commit should be harmless. It can be used without commit f362692
and may speed up itembar layout a bit.
plugins/launcher/launcher.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index d68d21a..8af2ff5 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1713,6 +1713,14 @@ launcher_plugin_button_update (LauncherPlugin *plugin)
{
panel_return_if_fail (GTK_IS_LABEL (plugin->child));
mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
+
+ /* disable the "small" property in the deskbar mode and the label
visible */
+ if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR &&
+ plugin->show_label)
+xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), FALSE);
+ else
+xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), TRUE);
+
gtk_label_set_angle (GTK_LABEL (plugin->child),
(mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? 270 :
0);
gtk_label_set_text (GTK_LABEL (plugin->child),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
