Hello community, here is the log from the commit of package poedit for openSUSE:Factory checked in at 2018-07-13 10:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poedit (Old) and /work/SRC/openSUSE:Factory/.poedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poedit" Fri Jul 13 10:21:22 2018 rev:45 rq:622242 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/poedit/poedit.changes 2018-06-20 15:23:43.642682493 +0200 +++ /work/SRC/openSUSE:Factory/.poedit.new/poedit.changes 2018-07-13 10:21:24.950460081 +0200 @@ -1,0 +2,7 @@ +Wed Jul 11 20:55:20 UTC 2018 - antoine.belv...@opensuse.org + +- PoEdit 2.0.9: + * Improved dark theme supports (still not perfect). + * Fixed broken list rendering of RTL text on Windows. + +------------------------------------------------------------------- Old: ---- poedit-2.0.8.tar.gz New: ---- poedit-2.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poedit.spec ++++++ --- /var/tmp/diff_new_pack.ZIBfOZ/_old 2018-07-13 10:21:25.658460928 +0200 +++ /var/tmp/diff_new_pack.ZIBfOZ/_new 2018-07-13 10:21:25.658460928 +0200 @@ -19,7 +19,7 @@ %bcond_without language_detection %bcond_without crowdin_integration Name: poedit -Version: 2.0.8 +Version: 2.0.9 Release: 0 Summary: Gettext Catalog Editing Tool License: MIT ++++++ poedit-2.0.8.tar.gz -> poedit-2.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/NEWS new/poedit-2.0.9/NEWS --- old/poedit-2.0.8/NEWS 2018-06-03 18:40:55.000000000 +0200 +++ new/poedit-2.0.9/NEWS 2018-07-11 17:06:36.000000000 +0200 @@ -1,4 +1,11 @@ +Version 2.0.9 +------------- + +- Improved dark theme supports (still not perfect). +- Fix broken list rendering of RTL text on Windows. + + Version 2.0.8 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/configure new/poedit-2.0.9/configure --- old/poedit-2.0.8/configure 2018-06-03 18:41:19.000000000 +0200 +++ new/poedit-2.0.9/configure 2018-07-11 17:07:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poedit 2.0.8. +# Generated by GNU Autoconf 2.69 for poedit 2.0.9. # # Report bugs to <h...@poedit.net>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='poedit' PACKAGE_TARNAME='poedit' -PACKAGE_VERSION='2.0.8' -PACKAGE_STRING='poedit 2.0.8' +PACKAGE_VERSION='2.0.9' +PACKAGE_STRING='poedit 2.0.9' PACKAGE_BUGREPORT='h...@poedit.net' PACKAGE_URL='' @@ -1353,7 +1353,7 @@ # 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 2.0.8 to adapt to many kinds of systems. +\`configure' configures poedit 2.0.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1423,7 +1423,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poedit 2.0.8:";; + short | recursive ) echo "Configuration of poedit 2.0.9:";; esac cat <<\_ACEOF @@ -1576,7 +1576,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poedit configure 2.0.8 +poedit configure 2.0.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1983,7 +1983,7 @@ 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 2.0.8, which was +It was created by poedit $as_me 2.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2331,7 +2331,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -PACKAGE_SHORT_VERSION=2.0.8 +PACKAGE_SHORT_VERSION=2.0.9 ac_aux_dir= @@ -2924,7 +2924,7 @@ # Define the identity of the package. PACKAGE='poedit' - VERSION='2.0.8' + VERSION='2.0.9' cat >>confdefs.h <<_ACEOF @@ -9661,7 +9661,7 @@ # 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 2.0.8, which was +This file was extended by poedit $as_me 2.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9718,7 +9718,7 @@ 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 2.0.8 +poedit config.status 2.0.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/configure.ac new/poedit-2.0.9/configure.ac --- old/poedit-2.0.8/configure.ac 2018-06-03 18:40:55.000000000 +0200 +++ new/poedit-2.0.9/configure.ac 2018-07-11 17:06:36.000000000 +0200 @@ -2,8 +2,8 @@ AC_PREREQ(2.59) -AC_INIT([poedit], [2.0.8], [h...@poedit.net]) -PACKAGE_SHORT_VERSION=2.0.8 +AC_INIT([poedit], [2.0.9], [h...@poedit.net]) +PACKAGE_SHORT_VERSION=2.0.9 AC_SUBST(PACKAGE_SHORT_VERSION) AC_CONFIG_AUX_DIR([admin]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/docs/poedit.1 new/poedit-2.0.9/docs/poedit.1 --- old/poedit-2.0.8/docs/poedit.1 2018-06-03 18:41:20.000000000 +0200 +++ new/poedit-2.0.9/docs/poedit.1 2018-07-11 17:07:01.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: poedit .\" Author: Vaclav Slavik <vac...@slavik.io> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/03/2018 +.\" Date: 07/11/2018 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "POEDIT" "1" "06/03/2018" "\ \&" "\ \&" +.TH "POEDIT" "1" "07/11/2018" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/colorscheme.cpp new/poedit-2.0.9/src/colorscheme.cpp --- old/poedit-2.0.8/src/colorscheme.cpp 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/colorscheme.cpp 2018-07-11 17:06:42.000000000 +0200 @@ -59,8 +59,11 @@ } // anonymous namespace std::unique_ptr<ColorScheme::Data> ColorScheme::s_data; +bool ColorScheme::s_appModeDetermined = false; +ColorScheme::Mode ColorScheme::s_appMode = ColorScheme::Mode::Light; -wxColour ColorScheme::DoGet(Color color, Type type) + +wxColour ColorScheme::DoGet(Color color, Mode type) { switch (color) { @@ -130,9 +133,12 @@ // Backgrounds: case Color::SidebarBackground: - return "#edf0f4"; + if (GetAppMode() == Dark) + return "#120f0b"; + else + return "#edf0f4"; case Color::EditingBackground: - return *wxWHITE; + return wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); // Fuzzy toggle: case Color::FuzzySwitch: @@ -184,12 +190,26 @@ } -ColorScheme::Type ColorScheme::GetSchemeTypeFromWindow(const wxVisualAttributes& win) +ColorScheme::Mode ColorScheme::GetAppMode() +{ + if (!s_appModeDetermined) + { + auto colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + if (colBg.Red() < 0x60 && colBg.Green() < 0x60 && colBg.Blue() < 0x60) + s_appMode = Dark; + else + s_appMode = Light; + s_appModeDetermined = true; + } + + return s_appMode; +} + + +ColorScheme::Mode ColorScheme::GetWindowMode(const wxVisualAttributes& win) { // Use dark scheme for very dark backgrounds: - if (win.colBg.Red() < 0x60 && - win.colBg.Green() < 0x60 && - win.colBg.Blue() < 0x60) + if (win.colBg.Red() < 0x60 && win.colBg.Green() < 0x60 && win.colBg.Blue() < 0x60) { return Dark; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/colorscheme.h new/poedit-2.0.9/src/colorscheme.h --- old/poedit-2.0.8/src/colorscheme.h 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/colorscheme.h 2018-07-11 17:06:42.000000000 +0200 @@ -88,14 +88,14 @@ class ColorScheme { public: - /// Type of the scheme to use (not used a lot for now) - enum Type + /// Mode of the scheme to use (not used a lot for now) + enum Mode { Light, Dark }; - static const wxColour& Get(Color color, Type type = Light) + static const wxColour& Get(Color color, Mode type = Light) { if (!s_data) s_data = std::make_unique<Data>(); @@ -113,11 +113,19 @@ static const wxColour& Get(Color color, const wxVisualAttributes& win) { - return Get(color, GetSchemeTypeFromWindow(win)); + return Get(color, GetWindowMode(win)); } static wxColour GetBlendedOn(Color color, wxWindow *win); + /// Returns app-wide mode (dark, light) + static Mode GetAppMode(); + static Mode GetWindowMode(const wxVisualAttributes& win); + static Mode GetWindowMode(wxWindow *win) + { + return GetWindowMode(win->GetDefaultAttributes()); + } + static void CleanUp(); private: @@ -126,10 +134,11 @@ wxColour colors[static_cast<size_t>(Color::Max)][2]; }; - static wxColour DoGet(Color color, Type type); - static Type GetSchemeTypeFromWindow(const wxVisualAttributes& win); + static wxColour DoGet(Color color, Mode type); static std::unique_ptr<Data> s_data; + static bool s_appModeDetermined; + static Mode s_appMode; }; #endif // Poedit_colorscheme_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/editing_area.cpp new/poedit-2.0.9/src/editing_area.cpp --- old/poedit-2.0.8/src/editing_area.cpp 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/editing_area.cpp 2018-07-11 17:06:42.000000000 +0200 @@ -453,6 +453,9 @@ m_pluralNotebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_NOPAGETHEME); m_pluralNotebook->SetWindowVariant(wxWINDOW_VARIANT_SMALL); +#ifdef __WXMSW__ + m_pluralNotebook->SetBackgroundColour(GetBackgroundColour()); +#endif sizer->Add(transLineSizer, wxSizerFlags().Expand().Border(wxLEFT|wxTOP, PX(6))); sizer->AddSpacer(PX(6)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/edlistctrl.cpp new/poedit-2.0.9/src/edlistctrl.cpp --- old/poedit-2.0.8/src/edlistctrl.cpp 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/edlistctrl.cpp 2018-07-11 17:06:42.000000000 +0200 @@ -505,6 +505,11 @@ UpdateHeaderAttrs(); +#ifdef __WXMSW__ + if (ColorScheme::GetWindowMode(this) == ColorScheme::Dark) + SetAlternateRowColour(GetBackgroundColour().ChangeLightness(108)); +#endif + Bind(wxEVT_SIZE, &PoeditListCtrl::OnSize, this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/text_control.cpp new/poedit-2.0.9/src/text_control.cpp --- old/poedit-2.0.8/src/text_control.cpp 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/text_control.cpp 2018-07-11 17:06:42.000000000 +0200 @@ -469,7 +469,7 @@ NSDictionary *m_attrSpace, *m_attrEscape, *m_attrMarkup, *m_attrFormat; typedef NSDictionary* AttrType; - Attributes() + Attributes(wxTextCtrl*) { m_attrSpace = @{NSBackgroundColorAttributeName: ColorScheme::Get(Color::SyntaxLeadingWhitespaceBg).OSXGetNSColor()}; m_attrEscape = @{NSBackgroundColorAttributeName: ColorScheme::Get(Color::SyntaxEscapeBg).OSXGetNSColor(), @@ -481,10 +481,10 @@ wxTextAttr m_attrDefault, m_attrSpace, m_attrEscape, m_attrMarkup, m_attrFormat; typedef wxTextAttr AttrType; - Attributes() + Attributes(wxTextCtrl *ctrl) { - m_attrDefault.SetBackgroundColour(*wxWHITE); - m_attrDefault.SetTextColour(*wxBLACK); + m_attrDefault.SetBackgroundColour(ctrl->GetBackgroundColour()); + m_attrDefault.SetTextColour(ctrl->GetForegroundColour()); m_attrSpace.SetBackgroundColour(ColorScheme::Get(Color::SyntaxLeadingWhitespaceBg)); @@ -514,9 +514,9 @@ AnyTranslatableTextCtrl::AnyTranslatableTextCtrl(wxWindow *parent, wxWindowID winid, int style) - : CustomizedTextCtrl(parent, winid, style), - m_attrs(new Attributes) + : CustomizedTextCtrl(parent, winid, style) { + m_attrs.reset(new Attributes(this)); Bind(wxEVT_TEXT, [=](wxCommandEvent& e){ e.Skip(); HighlightText(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/version.h new/poedit-2.0.9/src/version.h --- old/poedit-2.0.8/src/version.h 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/version.h 2018-07-11 17:06:42.000000000 +0200 @@ -26,8 +26,8 @@ #ifndef _VERSION_H_ #define _VERSION_H_ -#define POEDIT_VERSION "2.0.8" -#define POEDIT_VERSION_SHORT "2.0.8" -#define POEDIT_VERSION_WIN 2,0,8 +#define POEDIT_VERSION "2.0.9" +#define POEDIT_VERSION_SHORT "2.0.9" +#define POEDIT_VERSION_WIN 2,0,9 #endif // _VERSION_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-2.0.8/src/welcomescreen.cpp new/poedit-2.0.9/src/welcomescreen.cpp --- old/poedit-2.0.8/src/welcomescreen.cpp 2018-06-03 18:41:01.000000000 +0200 +++ new/poedit-2.0.9/src/welcomescreen.cpp 2018-07-11 17:06:42.000000000 +0200 @@ -25,6 +25,7 @@ #include "welcomescreen.h" +#include "colorscheme.h" #include "crowdin_gui.h" #include "edapp.h" #include "edframe.h" @@ -165,7 +166,15 @@ m_clrNorm("#444444"), m_clrSub("#aaaaaa") { - SetBackgroundColour(wxColour("#fffcf5")); + switch (ColorScheme::GetAppMode()) + { + case ColorScheme::Light: + SetBackgroundColour("#fffcf5"); + break; + case ColorScheme::Dark: + SetBackgroundColour("#00030a"); + break; + } #if defined(__WXOSX__) auto guiface = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFaceName();