Commit 1de2a347 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor issues

parent 003b411f
......@@ -19,11 +19,11 @@
#include "concCalculator.h"
#include <ktoolinvocation.h>
#include "kalziumutils.h"
#include <kunitconversion/converter.h>
#include "prefs.h"
#include <klocalizedstring.h>
#include <KLocalizedString>
#include <KToolInvocation>
#include <QDebug>
using namespace KUnitConversion;
......@@ -221,7 +221,7 @@ void concCalculator::calculateAmtSolute()
break;
}
// update mass of solute
m_amtSolute = Value(massSolute, "grams");
m_amtSolute = Value(massSolute, KUnitConversion::Gram);
m_amtSolute = m_amtSolute.convertTo(ui.amtSlt_unit->currentText());
ui.amtSolute->setValue(m_amtSolute.number());
break;
......
......@@ -160,7 +160,7 @@ void MoleculeDialog::slotLoadMolecule()
commonMoleculeFormats + "(*.cml *.xyz *.ent *.pdb *.alc *.chm *.cdx *.cdxml *.c3d1 *.c3d2"
" *.gpr *.mdl *.mol *.sdf *.sd *.crk3d *.cht *.dmol *.bgf"
" *.gam *.inp *.gamin *.gamout *.tmol *.fract"
" *.mpd *.mol2);;" + allFiles + "(*.*)");
" *.mpd *.mol2);;" + allFiles + "(*)");
loadMolecule(filename);
}
......@@ -213,14 +213,14 @@ void MoleculeDialog::slotSaveMolecule()
QString commonMoleculeFormats = i18n("Common molecule formats");
QString allFiles = i18n("All files");
QString filename = QFileDialog::getSaveFileName(this, i18n("Choose a file to save to"), QString(),
commonMoleculeFormats + " (*.cml *.xyz *.ent *.pdb *.alc *.chm *.cdx *.cdxml *.c3d1 *.c3d2"
commonMoleculeFormats + QLatin1String(" (*.cml *.xyz *.ent *.pdb *.alc *.chm *.cdx *.cdxml *.c3d1 *.c3d2"
" *.gpr *.mdl *.mol *.sdf *.sd *.crk3d *.cht *.dmol *.bgf"
" *.gam *.inp *.gamin *.gamout *.tmol *.fract"
" *.mpd *.mol2);;" + allFiles + " (*.*)"
" *.mpd *.mol2);;") + allFiles + QLatin1String(" (*)")
);
if (!filename.contains('.')) {
filename.append(".cml");
if (!filename.contains(QLatin1String("."))) {
filename.append(QLatin1String(".cml"));
}
IoWrapper io;
......
......@@ -133,7 +133,7 @@ void KOpenBabel::slotAddFile()
this,
i18n("Open Molecule File"),
QUrl(),
i18n("All Files") + "(*.*);;" + tmpList.join(";;") //add all possible extensions like "*.cml *.mol"
i18n("All Files") + QLatin1String("(*);;") + tmpList.join(QLatin1String(";;")) //add all possible extensions like "*.cml *.mol"
);
foreach (const QUrl &u , fl) {
......
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