...
 
Commits (3)
/debian/*.debhelper
/debian/*.log
/debian/*.substvars
/debian/debhelper-build-stamp
/debian/files
/debian/obconf-qt/
obconf-qt-0.14.1 / 2019-02-25
=============================
* Bumped version to 0.14.1
* Only translations was changed.
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
=============================
* Bumped minor version to 13
* Spanish translation update
* CMake: Prevent in-source builds
* fixed lxde mentions
* Add Traditional Chinese translation
* Add Traditional Chinese translation
* Add Simplified Chinese translation
* Fixes Qt4 build
* cmake: Use LXQtCompilerSettings
* cmake: Handle CMP0071
* cmake: Make it compile with Qt4
* cmake: Update CMake minimum required version
obconf-qt-0.12.0 / 2017-09-24
=============================
* Release 0.12.0: Update changelog
* Bump version to 0.12.0
* Don't export github templates
* Added Lithuanian language
......@@ -15,8 +57,8 @@ obconf-qt-0.12.0 / 2017-09-24
* 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
......@@ -26,8 +68,8 @@ obconf-qt-0.12.0 / 2017-09-24
* 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)
......@@ -55,8 +97,8 @@ obconf-qt-0.12.0 / 2017-09-24
* 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
......@@ -77,8 +119,8 @@ obconf-qt-0.12.0 / 2017-09-24
* 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).
......@@ -91,7 +133,16 @@ obconf-qt-0.12.0 / 2017-09-24
* 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)
find_program(SED_PROGRAM sed)
include(GNUInstallDirs)
set(LXQTBT_MINIMUM_VERSION "0.1.0")
# Support Qt4 for the time being
option(USE_QT4 "Build with Qt4." $ENV{USE_QT4})
# 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 14)
set(OBCONFQT_PATCH_VERSION 1)
set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION})
add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_AUTOMOC ON)
if(USE_QT4)
find_package(Qt4 REQUIRED QtCore QtGui) # Qt
include(${QT_USE_FILE})
message(STATUS "Building with Qt${QTVERSION}")
else()
cmake_minimum_required(VERSION 2.8.11)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5X11Extras REQUIRED)
find_package(Qt5LinguistTools REQUIRED QUIET)
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()
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(LXQtPreventInSourceBuilds)
include(LXQtTranslateTs)
include(LXQtTranslateDesktop)
include(LXQtCompilerSettings)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# add src subdirectory
add_subdirectory(src)
......
......@@ -11,7 +11,7 @@ It is maintained by the LXQt project but can be used independently from this des
### Compiling source code
Runtime dependencies are Qt X11 Extras, gtk-update-icon-cache, hicolor-icon-theme and Openbox.
Additional build dependencies are CMake and [liblxqt](https://github.com/lxde/liblxqt), optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Additional build dependencies are CMake and [liblxqt](https://github.com/lxqt/liblxqt), optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.
......@@ -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>
/*.debhelper
/*.log
/*.substvars
/debhelper-build-stamp
/files
/obconf-qt/
/obconf-qt5/
obconf-qt (0.14.1-1) unstable; urgency=medium
* Cherry-picked upstream release 0.14.1.
-- Alf Gaida <agaida@siduction.org> Tue, 26 Feb 2019 00:38:38 +0100
obconf-qt (0.14.0-1) unstable; urgency=medium
* Cherry-picked upstream release 0.14.0.
* Bumped Standards to 4.3.0, no changes needed
* Dropped d/compat, use debhelper-compat = 12, no changes needed
* Fixed years in d/copyright
* Bumped minimum version lxqt-build-tools (>= 0.6.0~)
* Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
* Added l10n-package, moved from lxqt-l10n
* Added d/upstream/metadata
-- Alf Gaida <agaida@siduction.org> Sun, 27 Jan 2019 15:13:23 +0100
obconf-qt (0.13.0-1) unstable; urgency=medium
* Cherry-picked upstream release 0.13.0.
* Bump lxqt-build-tools to >= 0.5.0~
* Fixed watch file lxde -> lxqt
-- Alf Gaida <agaida@siduction.org> Wed, 23 May 2018 20:16:01 +0200
obconf-qt (0.12.0-4) unstable; urgency=medium
* Bumped compat to 11
......
......@@ -5,13 +5,13 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: utils
Priority: optional
Build-Depends: debhelper (>= 11~),
Build-Depends: debhelper-compat (= 12),
libkf5windowsystem-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
lxqt-build-tools (>= 0.4.0),
lxqt-build-tools (>= 0.6.0~),
openbox-dev
Standards-Version: 4.1.4
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/lxqt-team/obconf-qt
Vcs-Git: https://salsa.debian.org/lxqt-team/obconf-qt.git
Homepage: https://github.com/lxqt/obconf-qt
......@@ -26,3 +26,14 @@ Description: Openbox configuration with a Qt interface
obconf-qt is an utility to configure openbox with a Qt interface.
.
This package contain the application files.
Package: obconf-qt-l10n
Architecture: all
Multi-Arch: foreign
Section: localization
Depends: ${misc:Depends},
qttranslations5-l10n
Breaks: obconf-qt (<< 0.11.0)
Replaces: obconf-qt (<< 0.11.0)
Description: Language package for obconf-qt
This package contains the l10n files needed by the obconf-qt.
usr/share/obconf-qt/translations/
usr/share/applications/obconf-qt.desktop
usr/share/icons/hicolor/48x48/apps/obconf-qt.png
usr/bin/obconf-qt
......@@ -8,8 +8,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh ${@} --buildsystem cmake
override_dh_missing:
dh_missing --fail-missing
override_dh_auto_configure:
dh_auto_configure -- \
-DPULL_TRANSLATIONS=OFF\
-DUPDATE_TRANSLATIONS=OFF\
-DCMAKE_BUILD_TYPE=RelWithDebInfo
Name: obconf-qt
Bug-Database: https://github.com/lxqt/obconf-qt/issues
Bug-Submit: https://github.com/lxqt/obconf-qt/issues/new
Changelog: https://github.com/lxqt/obconf-qt/blob/master/CHANGELOG
Repository: https://github.com/lxqt/obconf-qt
Repository-Browser: https://github.com/lxqt/obconf-qt
# 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,9 @@ 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)
# The ui code generated by Qt uic contains QMetaObject::connectSlotsByName()
# but we don't want that. Fix it with sed.
......@@ -58,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_QT4
${USE_QT4}
UPDATE_TRANSLATIONS
${UPDATE_TRANSLATIONS}
SOURCES
......@@ -67,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
......@@ -103,7 +86,7 @@ add_definitions(
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);
......
......@@ -194,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);
......@@ -224,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);
......@@ -239,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.
Name[es]=Configuración de Openbox
GenericName[es]=Configuración del gestor de ventanas
Comment[es]=Configurar el gestor de ventanas 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.
Name[tr]=Openbox Ayarları
GenericName[tr]=Pencere Yöneticisi Ayarları
Comment[tr]=Openbox pencere yöneticisini yapılandırma
This diff is collapsed.
This diff is collapsed.
Name[zh_CN]=Openbox 设置
GenericName[zh_CN]=窗口管理器设置
Comment[zh_CN]=配置窗口管理器
This diff is collapsed.
Name[zh_TW]=Openbox 設定
GenericName[zh_TW]=視窗管理員設定
Comment[zh_TW]=設定視窗管理員