Cherry-picking upstream release 0.12.0.
* Switched to experimental * Bumped minimum version of lxqt-build-tools to >= 0.4.0 * Bumped Standards to 4.1.0, no changes needed
This commit is contained in:
parent
b9e9fc2492
commit
9fa38b8e4e
2
AUTHORS
2
AUTHORS
@ -1,5 +1,5 @@
|
|||||||
Copyright:
|
Copyright:
|
||||||
Copyright (c) 2012-2016 LXQt team
|
Copyright (c) 2012-2017 LXQt team
|
||||||
|
|
||||||
This program is based on source code from the ObConf project
|
This program is based on source code from the ObConf project
|
||||||
<http://openbox.org/wiki/ObConf:About>
|
<http://openbox.org/wiki/ObConf:About>
|
||||||
|
19
CHANGELOG
19
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
|
* Create obconf-qt_fr.desktop
|
||||||
* Use the LXQtCompilerSettings
|
* Use the LXQtCompilerSettings
|
||||||
* Use lxqt-build-tools translation modules
|
* Use lxqt-build-tools translation modules
|
||||||
|
@ -23,7 +23,7 @@ else()
|
|||||||
find_package(Qt5Widgets REQUIRED)
|
find_package(Qt5Widgets REQUIRED)
|
||||||
find_package(Qt5X11Extras REQUIRED)
|
find_package(Qt5X11Extras REQUIRED)
|
||||||
find_package(Qt5LinguistTools REQUIRED QUIET)
|
find_package(Qt5LinguistTools REQUIRED QUIET)
|
||||||
message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
|
message(STATUS "Building with Qt${Qt5Core_VERSION}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
|
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
|
||||||
@ -38,6 +38,16 @@ pkg_check_modules(OPENBOX REQUIRED
|
|||||||
obt-3.5
|
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(LXQtTranslateTs)
|
||||||
include(LXQtTranslateDesktop)
|
include(LXQtTranslateDesktop)
|
||||||
include(LXQtCompilerSettings)
|
include(LXQtCompilerSettings)
|
||||||
|
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -1,12 +1,11 @@
|
|||||||
obconf-qt (0.12.0-1) experimental; urgency=medium
|
obconf-qt (0.12.0-1) experimental; urgency=medium
|
||||||
|
|
||||||
* Ne
|
* Cherry-picking upstream release 0.12.0.
|
||||||
* Switched to experimental
|
* Switched to experimental
|
||||||
* Bumped minimum version of lxqt-build-tools to >= 0.4.0
|
* Bumped minimum version of lxqt-build-tools to >= 0.4.0
|
||||||
* Bumped Standards to 4.1.0, no changes needed
|
* Bumped Standards to 4.1.0, no changes needed
|
||||||
|
|
||||||
|
-- Alf Gaida <agaida@siduction.org> Sun, 24 Sep 2017 12:56:19 +0200
|
||||||
-- Alf Gaida <agaida@siduction.org> Wed, 26 Jul 2017 00:13:47 +0200
|
|
||||||
|
|
||||||
obconf-qt (0.11.1-2) unstable; urgency=medium
|
obconf-qt (0.11.1-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
@ -180,11 +180,15 @@ static gboolean prop_get_string_utf8(Window win, Atom prop, gchar** ret) {
|
|||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||||
|
|
||||||
// load translations
|
// load translations
|
||||||
QTranslator qtTranslator, translator;
|
QTranslator qtTranslator, translator;
|
||||||
|
|
||||||
// install the translations built-into Qt itself
|
// install the translations built-into Qt itself
|
||||||
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
|
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
|
||||||
app.installTranslator(&qtTranslator);
|
app.installTranslator(&qtTranslator);
|
||||||
|
|
||||||
// install our own tranlations
|
// install our own tranlations
|
||||||
translator.load("obconf-qt_" + QLocale::system().name(), PACKAGE_DATA_DIR "/translations");
|
translator.load("obconf-qt_" + QLocale::system().name(), PACKAGE_DATA_DIR "/translations");
|
||||||
app.installTranslator(&translator);
|
app.installTranslator(&translator);
|
||||||
|
3
src/translations/obconf-qt_ca.desktop
Normal file
3
src/translations/obconf-qt_ca.desktop
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Name[ca]=Ajusts d'Openbox
|
||||||
|
GenericName[ca]=Ajusts del gestor de finestres
|
||||||
|
Comment[ca]=Configureu el gestor de finestres Openbox
|
3
src/translations/obconf-qt_da.desktop
Normal file
3
src/translations/obconf-qt_da.desktop
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Name[da]=Openbox-indstillinger
|
||||||
|
GenericName[da]=Indstillinger for Window Manager
|
||||||
|
Comment[da]=Konfigurér window manageren Openbox
|
3
src/translations/obconf-qt_lt.desktop
Normal file
3
src/translations/obconf-qt_lt.desktop
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Name[lt]=Openbox nustatymai
|
||||||
|
GenericName[lt]=Langų tvarkytuvės nustatymai
|
||||||
|
Comment[lt]=Konfigūruoti Openbox langų tvarkytuvę
|
3
src/translations/obconf-qt_pl.desktop
Normal file
3
src/translations/obconf-qt_pl.desktop
Normal file
@ -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)
|
Loading…
x
Reference in New Issue
Block a user