Verified Commit b33dbc3e authored by Alf Gaida's avatar Alf Gaida

Adding upstream version 0.14.0.

Signed-off-by: Alf Gaida's avatarAlf Gaida <agaida@siduction.org>
parent 3b9fd1ec
obconf-qt-0.14.0 / 2019-01-25
=============================
* Bumped version to 0.14.0
* Implementation fixed:
- Don't use automatic string conversions
- Fixed disfunctional *.obt Archive generation
- Fixed reorder compiler warning
- Fixed usage of memory after freed
- Removed unused variables
* Improved cmake scripting
- Set cmake_minimum_required to 3.1.0
- Use lxqt-build-tools FindGLib CMake module
- Removed locale compile definitons
- Handle ldflags when the module library is not installed in a system dir.
* Moved translations from lxqt-l10n back to obconf-qt
- Removed obsolete translation fuctionality
- Added translation promo in README.md
* Translation updates
obconf-qt-0.13.0 / 2018-05-21
=============================
......@@ -15,8 +35,8 @@ obconf-qt-0.13.0 / 2018-05-21
* cmake: Make it compile with Qt4
* cmake: Update CMake minimum required version
0.12.0 / 2017-09-24
===================
obconf-qt-0.12.0 / 2017-09-24
=============================
* Release 0.12.0: Update changelog
* Bump version to 0.12.0
......@@ -32,8 +52,8 @@ obconf-qt-0.13.0 / 2018-05-21
* Update AUTHORS
* Added *da.desktop
0.11.1 / 2016-12-11
===================
obconf-qt-0.11.1 / 2016-12-11
=============================
* Release 0.11.1: Update changelog
* Create obconf-qt_fr.desktop
......@@ -43,8 +63,8 @@ obconf-qt-0.13.0 / 2018-05-21
* Remove cpack (#22)
* README.md: Update dependencies
0.11.0 / 2016-09-24
===================
obconf-qt-0.11.0 / 2016-09-24
=============================
* Release 0.11.0: Add changelog
* Bump version to 0.2.0 (#20)
......@@ -72,8 +92,8 @@ obconf-qt-0.13.0 / 2018-05-21
* German translation
* Default to Qt5
0.9.0 / 2015-02-25
==================
obconf-qt-0.9.0 / 2015-02-25
============================
* Generate .desktop file again
* Enhance Portuguese translations
......@@ -94,8 +114,8 @@ obconf-qt-0.13.0 / 2018-05-21
* Commit from LXDE Pootle server by user rago1975.: 611 of 611 strings translated (0 need review).
* Support Qt5.
0.1.0 / 2014-05-07
==================
obconf-qt-0.1.0 / 2014-05-07
============================
* Sync COPYING file with the actual used license
* Commit from LXDE Pootle server by user knedlyk.: 72 of 108 strings translated (0 fuzzy).
......@@ -108,7 +128,16 @@ obconf-qt-0.13.0 / 2018-05-21
* Commit from LXDE Pootle server by user strebski.: 95 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 89 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user zvacet.: 73 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user hirkmt.: 108 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle * Bumped version to 0.14.0
* Don't use automatic string conversions
* Translation updates
* Improved cmake scripting
- set cmake_minimum_required to 3.1.0
- removed locale compile definitons
- installed man page
* Moved translations from lxqt-l10n back to compton-conf
- removed obsolete translation fuctionality
server by user hirkmt.: 108 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* Handle translations correctly.
* Commit from LXDE Pootle server by user zvacet.: 72 of 108 strings translated (0 fuzzy).
......
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
# CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level
# CMakeLists.txt file even before calling the project() command.
# The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION)
# command to specify that the current project code is written for the given range of CMake
# versions.
project(obconf-qt)
# newer cmake is required for CMAKE_AUTOMOC Qt support
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
find_program(SED_PROGRAM sed)
include(GNUInstallDirs)
set(LXQTBT_MINIMUM_VERSION "0.5.0")
# Minimum Versions
set(GLIB_MINIMUM_VERSION "2.50.0")
set(LXQTBT_MINIMUM_VERSION "0.6.0")
set(QT_MINIMUM_VERSION "5.7.1")
set(OBCONFQT_MAJOR_VERSION 0)
set(OBCONFQT_MINOR_VERSION 13)
set(OBCONFQT_MINOR_VERSION 14)
set(OBCONFQT_PATCH_VERSION 0)
set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION})
add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"")
# Support Qt4 for the time being
option(USE_QT4 "Build with Qt4." $ENV{USE_QT4})
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_AUTOMOC ON)
if(USE_QT4)
set(USE_QT5 FALSE)
find_package(Qt4 REQUIRED QtCore QtGui) # Qt
include(${QT_USE_FILE})
message(STATUS "Building with Qt${QTVERSION}")
else()
set(USE_QT5 TRUE)
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5X11Extras REQUIRED)
find_package(Qt5LinguistTools REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION}")
endif()
find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
find_package(Qt5X11Extras ${QT_MINIMUM_VERSION} REQUIRED)
find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION}")
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
find_package(PkgConfig)
pkg_check_modules(GLIB REQUIRED
glib-2.0
)
find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED)
find_package(PkgConfig)
pkg_check_modules(OPENBOX REQUIRED
obrender-3.5
obt-3.5
)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()
include(LXQtPreventInSourceBuilds)
include(LXQtTranslateTs)
include(LXQtTranslateDesktop)
include(LXQtCompilerSettings)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# add src subdirectory
......
......@@ -21,3 +21,10 @@ To build run `make`, to install `make install` which accepts variable `DESTDIR`
Official binary packages are available in Arch Linux and Debian (as of Debian stretch).
The tool is missing in Fedora so far. Same applies to openSUSE where it is about to be included, though.
### Translation (Weblate)
<a href="https://weblate.lxqt.org/projects/lxqt/obconf-qt/">
<img src="https://weblate.lxqt.org/widgets/lxqt/-/obconf-qt/multi-auto.svg" alt="Translation status" />
</a>
# set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
# set visibility to hidden to hide symbols, unlesss they're exporteted manually in the code
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS")
if(USE_QT4)
set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR})
set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
else()
set(QTX_INCLUDE_DIRS "")
set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
endif()
set(QTX_INCLUDE_DIRS "")
set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
include_directories(
${QTX_INCLUDE_DIRS}
......@@ -36,11 +31,7 @@ set(obconf-qt_UIS
obconf.ui
)
if(USE_QT4)
qt4_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
else()
qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
endif()
qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON)
......@@ -60,8 +51,6 @@ add_custom_command(
# add translation for obconf-qt
option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
lxqt_translate_ts(QM_FILES
USE_QT5
${USE_QT5}
UPDATE_TRANSLATIONS
${UPDATE_TRANSLATIONS}
SOURCES
......@@ -69,14 +58,6 @@ lxqt_translate_ts(QM_FILES
${obconf-qt_UI_H}
INSTALL_DIR
"${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/translations"
PULL_TRANSLATIONS
${PULL_TRANSLATIONS}
CLEAN_TRANSLATIONS
${CLEAN_TRANSLATIONS}
TRANSLATIONS_REPO
${TRANSLATIONS_REPO}
TRANSLATIONS_REFSPEC
${TRANSLATIONS_REFSPEC}
)
# install a desktop entry file
......@@ -102,14 +83,10 @@ add_definitions(
-DTHEME_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/openbox/themes"
)
if (USE_QT4)
add_definitions(-DUSE_QT4)
endif()
target_link_libraries(obconf-qt
${QTX_LIBRARIES}
${GLIB_LIBRARIES}
${OPENBOX_LIBRARIES}
${OPENBOX_LDFLAGS}
)
install(TARGETS obconf-qt RUNTIME DESTINATION bin)
......@@ -121,7 +121,7 @@ void MainDialog::on_font_inactive_display_changed() {
static RrFont* read_font(Fm::FontButton* button, const gchar* place,
gboolean use_default) {
RrFont* font;
gchar* fontstring, *node;
gchar* node;
gchar* name, **names;
gchar* size;
gchar* weight;
......@@ -180,7 +180,6 @@ static RrFont* read_font(Fm::FontButton* button, const gchar* place,
if(!g_ascii_strcasecmp(slant, "Oblique")) rr_slant = RR_FONTSLANT_OBLIQUE;
font = RrFontOpen(rrinst, name, atoi(size), rr_weight, rr_slant);
// g_free(fontstring);
g_free(slant);
g_free(weight);
g_free(size);
......@@ -190,7 +189,6 @@ static RrFont* read_font(Fm::FontButton* button, const gchar* place,
}
static RrFont* write_font(Fm::FontButton* button, const gchar* place) {
gchar *c;
gchar *node;
RrFontWeight weight = RR_FONTWEIGHT_NORMAL;
RrFontSlant slant = RR_FONTSLANT_NORMAL;
......
......@@ -104,9 +104,7 @@ void MainDialog::desktops_read_names() {
}
void MainDialog::desktops_write_names() {
gchar** s;
xmlNodePtr n, c;
gint num = 0, last = -1;
// delete all existing keys
n = tree_get_node("desktops/names", NULL);
......
......@@ -28,9 +28,9 @@
using namespace Obconf;
MainDialog::MainDialog():
QDialog(),
themes(NULL),
themes_model(new QStandardItemModel()),
QDialog() {
themes_model(new QStandardItemModel()) {
ui.setupUi(this);
setWindowIcon(QIcon(PIXMAPS_DIR "/obconf-qt.png"));
......
......@@ -95,10 +95,10 @@ void MainDialog::moveresize_setup_tab() {
else if(opp) pos = EDGE_RIGHT;
else pos = EDGE_LEFT;
g_free(s);
ui.fixed_y_popup->setCurrentIndex(pos);
ui.fixed_y_pos->setValue(MAX(atoi(s), 0));
g_free(s);
i = tree_get_int("mouse/screenEdgeWarpTime", 400);
......
......@@ -180,9 +180,7 @@ static gboolean prop_get_string_utf8(Window win, Atom prop, gchar** ret) {
int main(int argc, char** argv) {
QApplication app(argc, argv);
#ifndef USE_QT4
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#endif
// load translations
QTranslator qtTranslator, translator;
......@@ -196,8 +194,6 @@ int main(int argc, char** argv) {
app.installTranslator(&translator);
// load configurations
gchar* p;
gboolean exit_with_error = FALSE;
parse_args(argc, argv);
......@@ -226,7 +222,6 @@ int main(int argc, char** argv) {
"openbox_config"))) {
QMessageBox::critical(NULL, QObject::tr("Error"),
QObject::tr("Failed to load an rc.xml. You have probably failed to install Openbox properly."));
exit_with_error = TRUE;
}
else {
doc = obt_xml_doc(parse_i);
......@@ -241,7 +236,6 @@ int main(int argc, char** argv) {
QString message = QObject::tr("Error while parsing the Openbox configuration file. Your configuration file is not valid XML.\n\nMessage: %1")
.arg(QString::fromUtf8(e->message));
QMessageBox::critical(NULL, QObject::tr("Error"), message);
exit_with_error = TRUE;
}
}
......
......@@ -48,7 +48,6 @@ void MainDialog::theme_load_all() {
gchar* p;
GList* it, *next;
gint i;
RrFont* active, *inactive, *menu_t, *menu_i, *osd;
QModelIndex currentItemIndex;
name = tree_get_string("theme/name", "TheBear");
......@@ -156,10 +155,11 @@ void MainDialog::on_install_theme_clicked() {
}
void MainDialog::on_theme_archive_clicked() {
QString filename = QFileDialog::getSaveFileName(this,
tr("Choose an Openbox theme"),
QString(),
"Openbox theme archives (*.obt);;");
QFileDialog* dialog = new QFileDialog();
dialog->setFileMode(QFileDialog::Directory);
QString filename="";
if(dialog->exec())
filename= dialog->selectedFiles()[0];
if(!filename.isEmpty()) {
archive_create(filename.toLocal8Bit().constData());
}
......
project(obconf-qt)
build_component("." "${CMAKE_INSTALL_FULL_DATADIR}/obconf-qt/translations")
This diff is collapsed.
This diff is collapsed.
Name[cs]=Openbox nastavení
GenericName[cs]=Nastavení správce oken
Comment[cs]=Nastavit správce oken Openbox
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment