Commit 56bbc626 authored by Alf Gaida's avatar Alf Gaida

New snapshot: 0.14.2~10-gba7ae6b-1

parent f8bab505
obconf-qt (0.14.2~10-gba7ae6b-1) experimental-snapshots; urgency=medium
* New snapshot: 0.14.1-10-gba7ae6b
-- Alf Gaida <agaida@siduction.org> Sat, 01 Jun 2019 14:42:10 +0200
obconf-qt (0.14.2~4-gff2b28b-1) experimental-snapshots; urgency=medium
* New snapshot: 0.14.1-4-gff2b28b
......
......@@ -83,6 +83,15 @@ add_definitions(
-DTHEME_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/openbox/themes"
)
target_compile_definitions(obconf-qt
PRIVATE
QT_USE_QSTRINGBUILDER
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
QT_NO_URL_CAST_FROM_STRING
QT_NO_CAST_FROM_BYTEARRAY
)
target_link_libraries(obconf-qt
${QTX_LIBRARIES}
${GLIB_LIBRARIES}
......
......@@ -40,7 +40,7 @@ void MainDialog::appearance_setup_tab() {
ui.animate_iconify->setChecked(tree_get_bool("theme/animateIconify", TRUE));
layout = tree_get_string("theme/titleLayout", "NLIMC");
ui.title_layout->setText(layout);
ui.title_layout->setText(QString::fromUtf8(static_cast<char*>(layout)));
// preview_update_set_title_layout(layout); // FIXME
g_free(layout);
......@@ -167,7 +167,7 @@ static RrFont* read_font(Fm::FontButton* button, const gchar* place,
}
QFont qfont;
qfont.setFamily(name);
qfont.setFamily(QString::fromUtf8(static_cast<char*>(name)));
// FIXME qfont.setWeight(weight);
qfont.setPointSize(atoi(size));
......@@ -197,7 +197,7 @@ static RrFont* write_font(Fm::FontButton* button, const gchar* place) {
if(qfont.bold())
weight = RR_FONTWEIGHT_BOLD;
QString size = QString("%1").arg(qfont.pointSize());
QString size = QStringLiteral("%1").arg(qfont.pointSize());
const char* slantStr = NULL;
switch(qfont.style()) {
......
......@@ -42,14 +42,14 @@ void FontButton::setFont(QFont font) {
font_ = font;
QString text = font.family();
if(font.bold()) {
text += " ";
text += QLatin1String(" ");
text += tr("Bold");
}
if(font.italic()) {
text += " ";
text += QLatin1String(" ");
text += tr("Italic");
}
text += QString(" %1").arg(font.pointSize());
text += QStringLiteral(" %1").arg(font.pointSize());
setText(text);
Q_EMIT changed();
}
......@@ -33,7 +33,7 @@ MainDialog::MainDialog():
themes_model(new QStandardItemModel()) {
ui.setupUi(this);
setWindowIcon(QIcon(PIXMAPS_DIR "/obconf-qt.png"));
setWindowIcon(QIcon(QStringLiteral(PIXMAPS_DIR) + QStringLiteral("/obconf-qt.png")));
// resize the list widget according to the width of its content.
ui.listWidget->setMaximumWidth(ui.listWidget->sizeHintForColumn(0) + ui.listWidget->frameWidth() * 2 + 2);
......
......@@ -186,11 +186,11 @@ int main(int argc, char** argv) {
QTranslator qtTranslator, translator;
// install the translations built-into Qt itself
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qtTranslator.load(QStringLiteral("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");
translator.load(QStringLiteral("obconf-qt_") + QLocale::system().name(), QStringLiteral(PACKAGE_DATA_DIR) + QStringLiteral("/translations"));
app.installTranslator(&translator);
// load configurations
......
......@@ -148,7 +148,7 @@ void MainDialog::on_install_theme_clicked() {
QString filename = QFileDialog::getOpenFileName(this,
tr("Choose an Openbox theme"),
QString(),
"Openbox theme archives (*.obt);;");
QStringLiteral("Openbox theme archives (*.obt);;"));
if(!filename.isEmpty()) {
theme_install(filename.toLocal8Bit().constData());
}
......@@ -157,7 +157,7 @@ void MainDialog::on_install_theme_clicked() {
void MainDialog::on_theme_archive_clicked() {
QFileDialog* dialog = new QFileDialog();
dialog->setFileMode(QFileDialog::Directory);
QString filename="";
QString filename=QLatin1String("");
if(dialog->exec())
filename= dialog->selectedFiles()[0];
if(!filename.isEmpty()) {
......
......@@ -393,12 +393,12 @@ D: Allestedsnærværende (på alle skriveborde)</translation>
<message>
<location filename="../obconf.ui" line="838"/>
<source>&amp;Show a notification when switching desktops</source>
<translation>&amp;Vis en notifikation når der skiftes skrivebord</translation>
<translation>&amp;Vis en underretning når der skiftes skrivebord</translation>
</message>
<message>
<location filename="../obconf.ui" line="845"/>
<source>&amp;Amount of time to show the notification for:</source>
<translation>Visningstid for &amp;notifikationen:</translation>
<translation>Visningstid for &amp;underretningen:</translation>
</message>
<message>
<location filename="../obconf.ui" line="868"/>
......
Name[gl]=Configuración do Openbox
GenericName[gl]=Configuración do xestor de xanelas
Comment[gl]=Configurar o xestor de xanelas Openbox
......@@ -381,12 +381,12 @@ D: Omnipresente (en todos os escritorios)</translation>
<message>
<location filename="../obconf.ui" line="1229"/>
<source>Hiding</source>
<translation>Agachamento</translation>
<translation>Agochamento</translation>
</message>
<message>
<location filename="../obconf.ui" line="1235"/>
<source>&amp;Delay before hiding:</source>
<translation>&amp;Demora antes de agachar:</translation>
<translation>&amp;Demora antes de agochar:</translation>
</message>
<message>
<location filename="../obconf.ui" line="1245"/>
......
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