[Debian-l10n-commits] poedit branch upstream updated. upstream/1.8.11-1-g218862c
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Mon Feb 20 10:17:12 UTC 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".
The branch, upstream has been updated
via 218862ce1b312960378ee775ce58adc878f56992 (commit)
from e00f01c36a5b92d63148e1fd7e3f498136927412 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
NEWS | 9 +++++++++
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
docs/poedit.1 | 4 ++--
src/catalog.cpp | 9 ++++++---
src/edapp.cpp | 6 ++++++
src/edframe.cpp | 3 +++
src/findframe.cpp | 12 +++++++++---
src/http_client_casablanca.cpp | 15 ++++++++++-----
src/language.h | 2 +-
src/languagectrl.cpp | 18 +++++++++++++++++-
src/propertiesdlg.cpp | 12 ++++++++----
src/resources/menus.xrc | 8 ++++++--
src/sidebar.cpp | 11 +++++++++--
src/text_control.cpp | 2 +-
src/version.h | 4 ++--
16 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/NEWS b/NEWS
index 373ec7f..8e37094 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
+Version 1.8.12
+--------------
+
+- Fixed previous msgid display.
+- Fixed Find to correctly highlight text with "whole words only" enabled.
+- [Windows] Fixed to accelerators and suggestions interaction with selection.
+- Poedit now passes --previous to msgmerge.
+
+
Version 1.8.11
--------------
diff --git a/configure b/configure
index 1862ad9..20d07ee 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poedit 1.8.11.
+# Generated by GNU Autoconf 2.69 for poedit 1.8.12.
#
# Report bugs to <help at poedit.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poedit'
PACKAGE_TARNAME='poedit'
-PACKAGE_VERSION='1.8.11'
-PACKAGE_STRING='poedit 1.8.11'
+PACKAGE_VERSION='1.8.12'
+PACKAGE_STRING='poedit 1.8.12'
PACKAGE_BUGREPORT='help at poedit.net'
PACKAGE_URL=''
@@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poedit 1.8.11 to adapt to many kinds of systems.
+\`configure' configures poedit 1.8.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1431,7 +1431,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poedit 1.8.11:";;
+ short | recursive ) echo "Configuration of poedit 1.8.12:";;
esac
cat <<\_ACEOF
@@ -1588,7 +1588,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poedit configure 1.8.11
+poedit configure 1.8.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1995,7 +1995,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poedit $as_me 1.8.11, which was
+It was created by poedit $as_me 1.8.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2343,7 +2343,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-PACKAGE_SHORT_VERSION=1.8.11
+PACKAGE_SHORT_VERSION=1.8.12
ac_aux_dir=
@@ -2935,7 +2935,7 @@ fi
# Define the identity of the package.
PACKAGE='poedit'
- VERSION='1.8.11'
+ VERSION='1.8.12'
cat >>confdefs.h <<_ACEOF
@@ -8747,7 +8747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poedit $as_me 1.8.11, which was
+This file was extended by poedit $as_me 1.8.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8804,7 +8804,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poedit config.status 1.8.11
+poedit config.status 1.8.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index e6d5867..ecfa6a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([poedit], [1.8.11], [help at poedit.net])
-PACKAGE_SHORT_VERSION=1.8.11
+AC_INIT([poedit], [1.8.12], [help at poedit.net])
+PACKAGE_SHORT_VERSION=1.8.12
AC_SUBST(PACKAGE_SHORT_VERSION)
AC_CONFIG_AUX_DIR([admin])
diff --git a/docs/poedit.1 b/docs/poedit.1
index 0132105..410c802 100644
--- a/docs/poedit.1
+++ b/docs/poedit.1
@@ -2,12 +2,12 @@
.\" Title: poedit
.\" Author: Vaclav Slavik <vaclav at slavik.io>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 10/20/2016
+.\" Date: 02/18/2017
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "POEDIT" "1" "10/20/2016" "\ \&" "\ \&"
+.TH "POEDIT" "1" "02/18/2017" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/src/catalog.cpp b/src/catalog.cpp
index 98f58da..f7b97c2 100644
--- a/src/catalog.cpp
+++ b/src/catalog.cpp
@@ -1591,9 +1591,10 @@ bool Catalog::Save(const wxString& po_file, bool save_mo,
// msgcat always outputs Unix line endings, so we need to reformat the file
if (msgcat_ok && outputCrlf == wxTextFileType_Dos)
{
+ wxCSConv conv(m_header.Charset);
wxTextFile finalFile(po_file_temp2);
- if (finalFile.Open())
- finalFile.Write(outputCrlf);
+ if (finalFile.Open(conv))
+ finalFile.Write(outputCrlf, conv);
}
if (!TempOutputFileFor::ReplaceFile(po_file_temp2, po_file))
@@ -2301,7 +2302,7 @@ bool Catalog::Merge(const CatalogPtr& refcat)
refcat->DoSaveOnly(tmp1, wxTextFileType_Unix);
DoSaveOnly(tmp2, wxTextFileType_Unix);
- wxString flags("-q --force-po");
+ wxString flags("-q --force-po --previous");
if (wxConfig::Get()->ReadBool("use_tm_when_updating", false) == false)
{
flags += " --no-fuzzy-matching";
@@ -2694,6 +2695,8 @@ wxString CatalogItem::GetOldMsgid() const
line.Remove(0, 1);
if (line.StartsWith("msgid \""))
line.Remove(0, 7);
+ else if (line.StartsWith("msgid_plural \""))
+ line.replace(0, 14, "\n");
s += UnescapeCString(line);
}
return s;
diff --git a/src/edapp.cpp b/src/edapp.cpp
index 9f4acda..63ae81b 100644
--- a/src/edapp.cpp
+++ b/src/edapp.cpp
@@ -1220,8 +1220,11 @@ void PoeditApp::TweakOSXMenuBar(wxMenuBar *bar)
NSMenu *editNS = edit->GetHMenu();
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wundeclared-selector"
AddNativeItem(editNS, 0, _("Undo"), @selector(undo:), @"z");
AddNativeItem(editNS, 1, _("Redo"), @selector(redo:), @"Z");
+ #pragma clang diagnostic pop
[editNS insertItem:[NSMenuItem separatorItem] atIndex:2];
if (pasteItem != -1) pasteItem += 3;
if (findItem != -1) findItem += 3;
@@ -1309,7 +1312,10 @@ void PoeditApp::CreateFakeOpenRecentMenu()
action:NULL
keyEquivalent:@""];
NSMenu *openRecentMenu = [[NSMenu alloc] initWithTitle:@"Open Recent"];
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wundeclared-selector"
[openRecentMenu performSelector:@selector(_setMenuName:) withObject:@"NSRecentDocumentsMenu"];
+ #pragma clang diagnostic pop
[menu setSubmenu:openRecentMenu forItem:item];
m_recentMenuData->menuItem = item;
m_recentMenuData->menu = openRecentMenu;
diff --git a/src/edframe.cpp b/src/edframe.cpp
index dfd7a12..3aaabe7 100644
--- a/src/edframe.cpp
+++ b/src/edframe.cpp
@@ -682,6 +682,9 @@ wxWindow* PoeditFrame::CreateContentViewPO(Content type)
m_labelContext = new wxStaticText(m_bottomPanel, -1, wxEmptyString);
m_labelContext->SetFont(m_normalGuiFont);
+#ifdef __WXOSX__
+ m_labelContext->SetMinSize(wxSize(-1, m_labelContext->GetBestSize().y + 3));
+#endif
m_labelContext->Hide();
m_labelSingular = new wxStaticText(m_bottomPanel, -1, _("Singular:"));
diff --git a/src/findframe.cpp b/src/findframe.cpp
index a53e90a..b2a86b1 100644
--- a/src/findframe.cpp
+++ b/src/findframe.cpp
@@ -566,9 +566,15 @@ bool FindFrame::DoFind(int dir)
textc = txt->GetValue();
if (ignoreCase)
textc.MakeLower();
- int pos = textc.Find(text);
- if (pos != wxNOT_FOUND)
- txt->ShowFindIndicator(pos, (int)text.length());
+ FindTextInStringAndDo
+ (
+ textc, text, wholeWords,
+ [=](const wxString&,size_t pos, size_t len)
+ {
+ txt->ShowFindIndicator((int)pos, (int)len);
+ return wxString::npos;
+ }
+ );
}
return true;
diff --git a/src/http_client_casablanca.cpp b/src/http_client_casablanca.cpp
index 056fc0a..a4d66e7 100644
--- a/src/http_client_casablanca.cpp
+++ b/src/http_client_casablanca.cpp
@@ -169,7 +169,14 @@ class http_client::impl
{
public:
impl(http_client& owner, const std::string& url_prefix, int flags)
- : m_owner(owner), m_native(sanitize_url(url_prefix, flags), get_client_config())
+ : m_owner(owner),
+ m_native
+ (
+ sanitize_url(url_prefix, flags)
+ #ifdef _WIN32
+ , get_client_config()
+ #endif
+ )
{
#define make_wide_str(x) make_wide_str_(x)
#define make_wide_str_(x) L ## x
@@ -361,11 +368,12 @@ private:
return to_string_t(url);
}
+#ifdef _WIN32
// prepare WinHttp configuration
static http::client::http_client_config get_client_config()
{
http::client::http_client_config c;
- #ifdef _WIN32
+
// WinHttp doesn't share WinInet/MSIE's proxy settings and has its own,
// but many users don't have properly configured both. Adopting proxy
// settings like this in desktop software is recommended behavior, see
@@ -385,12 +393,9 @@ private:
c.set_proxy(uri(L"//" + std::wstring(ieConfig.lpszProxy)));
}
}
- #endif
return c;
}
-private:
-#ifdef _WIN32
static bool is_windows_xp()
{
OSVERSIONINFOEX info;
diff --git a/src/language.h b/src/language.h
index e8adea1..719c818 100644
--- a/src/language.h
+++ b/src/language.h
@@ -43,7 +43,7 @@ enum class TextDirection
class Language
{
public:
- Language() {}
+ Language() : m_direction(TextDirection::LTR) {}
bool IsValid() const { return !m_code.empty(); }
const std::string& Code() const { return m_code; }
diff --git a/src/languagectrl.cpp b/src/languagectrl.cpp
index 958678c..2137db7 100644
--- a/src/languagectrl.cpp
+++ b/src/languagectrl.cpp
@@ -157,10 +157,26 @@ LanguageDialog::LanguageDialog(wxWindow *parent)
CenterOnParent();
m_language->SetFocus();
+
#ifdef __WXOSX__
// Workaround wx bug: http://trac.wxwidgets.org/ticket/9521
m_language->SelectAll();
-#endif
+
+ // Workaround broken Enter handling:
+ Bind(wxEVT_CHAR_HOOK, [=](wxKeyEvent& e){
+ if (e.GetKeyCode() == WXK_RETURN)
+ {
+ auto button = GetDefaultItem();
+ wxCommandEvent event(wxEVT_BUTTON, button->GetId());
+ event.SetEventObject(button);
+ button->ProcessWindowEvent(event);
+ }
+ else
+ {
+ e.Skip();
+ }
+ });
+#endif // __WXOSX__
}
bool LanguageDialog::Validate()
diff --git a/src/propertiesdlg.cpp b/src/propertiesdlg.cpp
index c2c7090..ea0bc97 100644
--- a/src/propertiesdlg.cpp
+++ b/src/propertiesdlg.cpp
@@ -269,22 +269,26 @@ public:
auto lbl = new wxStaticText(this, wxID_ANY, label);
sizer->Add(lbl, wxSizerFlags().Expand());
m_list = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_EXTENDED);
- sizer->Add(m_list, wxSizerFlags(1).Expand());
+ sizer->Add(m_list, wxSizerFlags(1).Expand().BORDER_WIN(wxLEFT, 1));
#if defined(__WXOSX__)
auto add = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("NSAddTemplate"), wxDefaultPosition, wxSize(18, 18), wxBORDER_SUNKEN);
auto remove = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("NSRemoveTemplate"), wxDefaultPosition, wxSize(18,18), wxBORDER_SUNKEN);
#elif defined(__WXMSW__)
- auto add = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-add"), wxDefaultPosition, wxSize(19,19));
- auto remove = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-remove"), wxDefaultPosition, wxSize(19,19));
+ auto add = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-add"), wxDefaultPosition, wxSize(PX(19),PX(19)));
+ auto remove = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-remove"), wxDefaultPosition, wxSize(PX(19),PX(19)));
#elif defined(__WXGTK__)
auto add = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-add"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
auto remove = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("list-remove"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
#endif
auto buttonSizer = new wxBoxSizer(wxHORIZONTAL);
buttonSizer->Add(add);
+#ifdef __WXOSX__
+ buttonSizer->AddSpacer(PX(1));
+#endif
buttonSizer->Add(remove);
- sizer->Add(buttonSizer);
+ sizer->AddSpacer(PX(1));
+ sizer->Add(buttonSizer, wxSizerFlags().BORDER_OSX(wxLEFT, PX(1)));
SetDropTarget(new DropTarget(this));
diff --git a/src/resources/menus.xrc b/src/resources/menus.xrc
index f44f07a..5843344 100644
--- a/src/resources/menus.xrc
+++ b/src/resources/menus.xrc
@@ -76,7 +76,9 @@
<object class="wxMenuItem" name="wxID_COPY"/>
<object class="wxMenuItem" name="wxID_PASTE"/>
<object class="wxMenuItem" name="wxID_DELETE" platform="unix|win"/>
- <object class="wxMenuItem" name="wxID_SELECTALL"/>
+ <object class="wxMenuItem" name="wxID_SELECTALL">
+ <accel>Ctrl+A</accel>
+ </object>
<object class="separator"/>
<object class="wxMenuItem" name="menu_clear" >
<label platform="win">Clear translation</label>
@@ -355,7 +357,9 @@
<object class="wxMenuItem" name="wxID_COPY" platform="mac"/>
<object class="wxMenuItem" name="wxID_PASTE" platform="mac"/>
<object class="wxMenuItem" name="wxID_CLEAR" platform="mac"/>
- <object class="wxMenuItem" name="wxID_SELECTALL" platform="mac"/>
+ <object class="wxMenuItem" name="wxID_SELECTALL" platform="mac">
+ <accel>Ctrl+A</accel>
+ </object>
</object>
<object class="wxMenu" name="menu_help">
<object class="wxMenuItem" name="wxID_HELP">
diff --git a/src/sidebar.cpp b/src/sidebar.cpp
index 9ee02ab..5914e89 100644
--- a/src/sidebar.cpp
+++ b/src/sidebar.cpp
@@ -71,6 +71,8 @@ public:
return wxSize(-1, 1);
}
+ bool AcceptsFocus() const override { return false; }
+
private:
void OnPaint(wxPaintEvent&)
{
@@ -257,10 +259,10 @@ private:
wxDEFINE_EVENT(EVT_SUGGESTION_SELECTED, wxCommandEvent);
-class SuggestionWidget : public wxPanel
+class SuggestionWidget : public wxWindow
{
public:
- SuggestionWidget(wxWindow *parent) : wxPanel(parent, wxID_ANY)
+ SuggestionWidget(wxWindow *parent) : wxWindow(parent, wxID_ANY)
{
m_icon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
m_text = new AutoWrappingText(this, "TEXT");
@@ -330,6 +332,8 @@ public:
SetMinSize(wxDefaultSize);
SetMinSize(GetBestSize());
}
+
+ bool AcceptsFocus() const override { return false; }
private:
class InfoStaticText : public wxStaticText
@@ -427,6 +431,9 @@ SuggestionsSidebarBlock::SuggestionsSidebarBlock(Sidebar *parent, wxMenu *menu)
SuggestionsSidebarBlock::~SuggestionsSidebarBlock()
{
+ ClearSuggestionsMenu();
+ for (auto i : m_suggestionMenuItems)
+ delete i;
}
wxBitmap SuggestionsSidebarBlock::GetIconForSuggestion(const Suggestion&) const
diff --git a/src/text_control.cpp b/src/text_control.cpp
index 6b96dd7..e429042 100644
--- a/src/text_control.cpp
+++ b/src/text_control.cpp
@@ -830,7 +830,7 @@ void TranslationTextCtrl::SetPlainTextUserWritten(const wxString& value)
DisableAutomaticSubstitutions disableAuto(this);
#endif
- SelectAll();
+ Clear();
WriteText(EscapePlainText(value));
SetInsertionPointEnd();
}
diff --git a/src/version.h b/src/version.h
index cfec0f2..a9a8188 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
-#define POEDIT_VERSION "1.8.11"
-#define POEDIT_VERSION_WIN 1,8,11
+#define POEDIT_VERSION "1.8.12"
+#define POEDIT_VERSION_WIN 1,8,12
#endif // _VERSION_H_
-----------------------------------------------------------------------
hooks/post-receive
--
poedit
More information about the Debian-l10n-commits
mailing list