diff --git a/AUTHORS b/AUTHORS index cd8da8f..5f603bd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ Copyright: - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team This program is based on source code from the ObConf project diff --git a/CHANGELOG b/CHANGELOG index 60bc59c..360e90a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,24 @@ -obconf-qt-0.11.1 / 2016-12-11 +obconf-qt-0.12.0 / 2017-09-24 ============================= + * Bump version to 0.12.0 + * Don't export github templates + * Added Lithuanian language + * liblxqt dont make sense here + * Copied issue template + * Drops Qt5Core_VERSION_STRING + * set Qt::AA_UseHighDpiPixmaps to true + * Added default CMAKE_BUILD_TYPE and versioning (#29) + * added Polish translation + * Add obconf-qt_ca.desktop (Catalan) + * Update AUTHORS + * Added *da.desktop + +0.11.1 / 2016-12-11 +=================== + + * Release 0.11.1: Update changelog * Create obconf-qt_fr.desktop * Use the LXQtCompilerSettings * Use lxqt-build-tools translation modules diff --git a/CMakeLists.txt b/CMakeLists.txt index 912e8f7..aafc986 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ else() find_package(Qt5Widgets REQUIRED) find_package(Qt5X11Extras REQUIRED) find_package(Qt5LinguistTools REQUIRED QUIET) - message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") + message(STATUS "Building with Qt${Qt5Core_VERSION}") endif() find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) @@ -38,6 +38,16 @@ pkg_check_modules(OPENBOX REQUIRED obt-3.5 ) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +set(OBCONFQT_MAJOR_VERSION 0) +set(OBCONFQT_MINOR_VERSION 12) +set(OBCONFQT_PATCH_VERSION 0) +set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION}) +add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"") + include(LXQtTranslateTs) include(LXQtTranslateDesktop) include(LXQtCompilerSettings) diff --git a/src/obconf-qt.cpp b/src/obconf-qt.cpp index b4a3bd1..5912fda 100644 --- a/src/obconf-qt.cpp +++ b/src/obconf-qt.cpp @@ -1,20 +1,20 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - * + * * main.c for ObConf, the configuration tool for Openbox * Copyright (c) 2003-2008 Dana Jansens * Copyright (c) 2003 Tim Riley * Copyright (C) 2013 Hong Jen Yee (PCMan) - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * See the COPYING file for a copy of the GNU General Public License. */ @@ -180,11 +180,15 @@ static gboolean prop_get_string_utf8(Window win, Atom prop, gchar** ret) { int main(int argc, char** argv) { QApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + // load translations QTranslator qtTranslator, translator; + // install the translations built-into Qt itself qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); app.installTranslator(&qtTranslator); + // install our own tranlations translator.load("obconf-qt_" + QLocale::system().name(), PACKAGE_DATA_DIR "/translations"); app.installTranslator(&translator); diff --git a/src/translations/obconf-qt_ca.desktop b/src/translations/obconf-qt_ca.desktop new file mode 100644 index 0000000..3cb64db --- /dev/null +++ b/src/translations/obconf-qt_ca.desktop @@ -0,0 +1,3 @@ +Name[ca]=Ajusts d'Openbox +GenericName[ca]=Ajusts del gestor de finestres +Comment[ca]=Configureu el gestor de finestres Openbox diff --git a/src/translations/obconf-qt_da.desktop b/src/translations/obconf-qt_da.desktop new file mode 100644 index 0000000..d1ca913 --- /dev/null +++ b/src/translations/obconf-qt_da.desktop @@ -0,0 +1,3 @@ +Name[da]=Openbox-indstillinger +GenericName[da]=Indstillinger for Window Manager +Comment[da]=Konfigurér window manageren Openbox diff --git a/src/translations/obconf-qt_lt.desktop b/src/translations/obconf-qt_lt.desktop new file mode 100644 index 0000000..5cf53db --- /dev/null +++ b/src/translations/obconf-qt_lt.desktop @@ -0,0 +1,3 @@ +Name[lt]=Openbox nustatymai +GenericName[lt]=Langų tvarkytuvės nustatymai +Comment[lt]=Konfigūruoti Openbox langų tvarkytuvę diff --git a/src/translations/obconf-qt_pl.desktop b/src/translations/obconf-qt_pl.desktop new file mode 100644 index 0000000..405ee99 --- /dev/null +++ b/src/translations/obconf-qt_pl.desktop @@ -0,0 +1,3 @@ +Name[pl]=Edytor konfiguracji OpenBox +GenericName[pl]=Ustawienia menedżera okien +Comment[pl]=Edytor konfiguracji menedżera okien OpenBox (wersja Qt)