mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kio: format and indent
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
6141ff5771
commit
86e76231c7
2 changed files with 173 additions and 166 deletions
|
|
@ -36,50 +36,49 @@ struct KEncodingFileDialogPrivate
|
|||
KComboBox *encoding;
|
||||
};
|
||||
|
||||
KEncodingFileDialog::KEncodingFileDialog(const QString& startDir, const QString& encoding , const QString& filter,
|
||||
const QString& caption, KFileDialog::OperationMode type, QWidget *parent)
|
||||
: KFileDialog(startDir,filter,parent), d(new KEncodingFileDialogPrivate)
|
||||
KEncodingFileDialog::KEncodingFileDialog(const QString &startDir, const QString &encoding , const QString &filter,
|
||||
const QString &caption, KFileDialog::OperationMode type, QWidget *parent)
|
||||
: KFileDialog(startDir, filter, parent),
|
||||
d(new KEncodingFileDialogPrivate())
|
||||
{
|
||||
setCaption(caption);
|
||||
//ops->clearHistory();
|
||||
setCaption(caption);
|
||||
|
||||
setOperationMode( type );
|
||||
setOperationMode(type);
|
||||
|
||||
d->encoding = new KComboBox(this);
|
||||
fileWidget()->setCustomWidget(i18n("Encoding:"), d->encoding);
|
||||
d->encoding = new KComboBox(this);
|
||||
fileWidget()->setCustomWidget(i18n("Encoding:"), d->encoding);
|
||||
|
||||
d->encoding->clear ();
|
||||
QString sEncoding = encoding;
|
||||
QByteArray systemEncoding = QTextCodec::codecForLocale()->name();
|
||||
if (sEncoding.isEmpty() || sEncoding == QLatin1String("System"))
|
||||
sEncoding = systemEncoding;
|
||||
|
||||
const QStringList encodings (KGlobal::charsets()->availableEncodingNames());
|
||||
int insert = 0, system = 0;
|
||||
bool foundRequested=false;
|
||||
foreach (const QString& encoding, encodings)
|
||||
{
|
||||
bool found = false;
|
||||
QTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encoding, found);
|
||||
|
||||
if (found)
|
||||
{
|
||||
d->encoding->addItem (encoding);
|
||||
if ( (codecForEnc->name() == sEncoding) || (encoding == sEncoding) )
|
||||
{
|
||||
d->encoding->setCurrentIndex(insert);
|
||||
foundRequested=true;
|
||||
}
|
||||
|
||||
if ( (codecForEnc->name() == systemEncoding) || (encoding == systemEncoding) )
|
||||
system=insert;
|
||||
insert++;
|
||||
d->encoding->clear();
|
||||
QString sEncoding = encoding;
|
||||
QByteArray systemEncoding = QTextCodec::codecForLocale()->name();
|
||||
if (sEncoding.isEmpty() || sEncoding == QLatin1String("System")) {
|
||||
sEncoding = systemEncoding;
|
||||
}
|
||||
}
|
||||
|
||||
if ( !foundRequested )
|
||||
d->encoding->setCurrentIndex(system);
|
||||
|
||||
int insert = 0;
|
||||
int system = 0;
|
||||
bool foundRequested = false;
|
||||
foreach (const QString &encoding, KGlobal::charsets()->availableEncodingNames()) {
|
||||
bool found = false;
|
||||
QTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encoding, found);
|
||||
|
||||
if (found) {
|
||||
d->encoding->addItem (encoding);
|
||||
if (codecForEnc->name() == sEncoding || encoding == sEncoding) {
|
||||
d->encoding->setCurrentIndex(insert);
|
||||
foundRequested=true;
|
||||
}
|
||||
|
||||
if (codecForEnc->name() == systemEncoding || encoding == systemEncoding) {
|
||||
system = insert;
|
||||
}
|
||||
insert++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!foundRequested) {
|
||||
d->encoding->setCurrentIndex(system);
|
||||
}
|
||||
}
|
||||
|
||||
KEncodingFileDialog::~KEncodingFileDialog()
|
||||
|
|
@ -87,125 +86,133 @@ KEncodingFileDialog::~KEncodingFileDialog()
|
|||
delete d;
|
||||
}
|
||||
|
||||
|
||||
QString KEncodingFileDialog::selectedEncoding() const
|
||||
{
|
||||
if (d->encoding)
|
||||
return d->encoding->currentText();
|
||||
else
|
||||
if (d->encoding) {
|
||||
return d->encoding->currentText();
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenFileNameAndEncoding(const QString& encoding,
|
||||
const QString& startDir,
|
||||
const QString& filter,
|
||||
QWidget *parent, const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenFileNameAndEncoding(const QString &encoding,
|
||||
const QString &startDir,
|
||||
const QString &filter,
|
||||
QWidget *parent, const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
Opening, parent);
|
||||
|
||||
dlg.setMode( KFile::File | KFile::LocalOnly );
|
||||
KEncodingFileDialog dlg(
|
||||
startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
KFileDialog::Opening, parent
|
||||
);
|
||||
dlg.setMode(KFile::File | KFile::LocalOnly);
|
||||
dlg.exec();
|
||||
|
||||
Result res;
|
||||
res.fileNames<<dlg.selectedFile();
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
res.fileNames << dlg.selectedFile();
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
return res;
|
||||
}
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenFileNamesAndEncoding(const QString& encoding,
|
||||
const QString& startDir,
|
||||
const QString& filter,
|
||||
QWidget *parent,
|
||||
const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenFileNamesAndEncoding(const QString &encoding,
|
||||
const QString &startDir,
|
||||
const QString &filter,
|
||||
QWidget *parent,
|
||||
const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(startDir, encoding, filter, caption.isNull() ? i18n("Open") : caption,
|
||||
Opening, parent);
|
||||
KEncodingFileDialog dlg(
|
||||
startDir, encoding, filter, caption.isNull() ? i18n("Open") : caption,
|
||||
KFileDialog::Opening, parent
|
||||
);
|
||||
dlg.setMode(KFile::Files | KFile::LocalOnly);
|
||||
dlg.exec();
|
||||
|
||||
Result res;
|
||||
res.fileNames=dlg.selectedFiles();
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
res.fileNames = dlg.selectedFiles();
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
return res;
|
||||
}
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenUrlAndEncoding(const QString& encoding, const QString& startDir,
|
||||
const QString& filter, QWidget *parent, const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenUrlAndEncoding(const QString &encoding, const QString &startDir,
|
||||
const QString &filter, QWidget *parent, const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
Opening, parent);
|
||||
|
||||
dlg.setMode( KFile::File );
|
||||
KEncodingFileDialog dlg(
|
||||
startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
KFileDialog::Opening, parent
|
||||
);
|
||||
dlg.setMode(KFile::File);
|
||||
dlg.exec();
|
||||
|
||||
Result res;
|
||||
res.URLs<<dlg.selectedUrl();
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
res.URLs = dlg.selectedUrl();
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
return res;
|
||||
}
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenUrlsAndEncoding(const QString& encoding, const QString& startDir,
|
||||
const QString& filter,
|
||||
QWidget *parent,
|
||||
const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getOpenUrlsAndEncoding(const QString &encoding, const QString &startDir,
|
||||
const QString &filter,
|
||||
QWidget *parent,
|
||||
const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
Opening, parent);
|
||||
|
||||
KEncodingFileDialog dlg(
|
||||
startDir, encoding, filter,
|
||||
caption.isNull() ? i18n("Open") : caption,
|
||||
KFileDialog::Opening, parent
|
||||
);
|
||||
dlg.setMode(KFile::Files);
|
||||
dlg.exec();
|
||||
|
||||
Result res;
|
||||
res.URLs=dlg.selectedUrls();
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
res.URLs = dlg.selectedUrls();
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(const QString& encoding,
|
||||
const QString& dir,
|
||||
const QString& filter,
|
||||
QWidget *parent,
|
||||
const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(const QString &encoding,
|
||||
const QString &dir,
|
||||
const QString &filter,
|
||||
QWidget *parent,
|
||||
const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(dir, encoding, filter,
|
||||
caption.isNull() ? i18n("Save As") : caption,
|
||||
Saving, parent);
|
||||
KEncodingFileDialog dlg(
|
||||
dir, encoding, filter,
|
||||
caption.isNull() ? i18n("Save As") : caption,
|
||||
KFileDialog::Saving, parent
|
||||
);
|
||||
dlg.setMode(KFile::File);
|
||||
dlg.exec();
|
||||
|
||||
QString filename = dlg.selectedFile();
|
||||
if (!filename.isEmpty())
|
||||
if (!filename.isEmpty()) {
|
||||
KRecentDocument::add(filename);
|
||||
}
|
||||
|
||||
Result res;
|
||||
res.fileNames<<filename;
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
res.fileNames << filename;
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getSaveUrlAndEncoding(const QString& encoding,
|
||||
const QString& dir, const QString& filter,
|
||||
QWidget *parent, const QString& caption)
|
||||
KEncodingFileDialog::Result KEncodingFileDialog::getSaveUrlAndEncoding(const QString &encoding,
|
||||
const QString &dir, const QString &filter,
|
||||
QWidget *parent, const QString &caption)
|
||||
{
|
||||
KEncodingFileDialog dlg(dir, encoding, filter,
|
||||
caption.isNull() ? i18n("Save As") : caption,
|
||||
Saving, parent);
|
||||
KEncodingFileDialog dlg(
|
||||
dir, encoding, filter,
|
||||
caption.isNull() ? i18n("Save As") : caption,
|
||||
KFileDialog::Saving, parent
|
||||
);
|
||||
dlg.setMode(KFile::File);
|
||||
|
||||
Result res;
|
||||
if (dlg.exec() == QDialog::Accepted) {
|
||||
KUrl url = dlg.selectedUrl();
|
||||
if (url.isValid())
|
||||
KRecentDocument::add( url );
|
||||
res.URLs<<url;
|
||||
res.encoding=dlg.selectedEncoding();
|
||||
KUrl url = dlg.selectedUrl();
|
||||
if (url.isValid()) {
|
||||
KRecentDocument::add(url);
|
||||
}
|
||||
res.URLs << url;
|
||||
res.encoding = dlg.selectedEncoding();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __KENCODINGFILEDIALOG_H__
|
||||
#define __KENCODINGFILEDIALOG_H__
|
||||
#ifndef KENCODINGFILEDIALOG_H
|
||||
#define KENCODINGFILEDIALOG_H
|
||||
|
||||
#include <kfiledialog.h>
|
||||
|
||||
|
|
@ -39,13 +39,13 @@ struct KEncodingFileDialogPrivate;
|
|||
class KIO_EXPORT KEncodingFileDialog : public KFileDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
class Result {
|
||||
public:
|
||||
QStringList fileNames;
|
||||
KUrl::List URLs;
|
||||
QString encoding;
|
||||
class Result
|
||||
{
|
||||
public:
|
||||
QStringList fileNames;
|
||||
KUrl::List URLs;
|
||||
QString encoding;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -54,8 +54,8 @@ public:
|
|||
* @param startDir This can either be
|
||||
* @li The URL of the directory to start in.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -64,7 +64,7 @@ public:
|
|||
* same keyword.
|
||||
*
|
||||
* @param encoding The encoding shown in the encoding combo. If it's
|
||||
* QString(), the global default encoding will be shown.
|
||||
* QString(), the global default encoding will be shown.
|
||||
*
|
||||
* @param filter A shell glob or a mime-type-filter that specifies which files to display.
|
||||
* The preferred option is to set a list of mimetype names, see setMimeFilter() for details.
|
||||
|
|
@ -74,15 +74,15 @@ public:
|
|||
* @param caption The caption of the dialog
|
||||
*
|
||||
* @param type This can either be
|
||||
* @li Opening (open dialog, the default setting)
|
||||
* @li Saving
|
||||
* @li Opening (open dialog, the default setting)
|
||||
* @li Saving
|
||||
* @param parent The parent widget of this dialog
|
||||
*/
|
||||
KEncodingFileDialog (const QString& startDir = QString(),
|
||||
const QString& encoding = QString(),
|
||||
const QString& filter = QString(),
|
||||
const QString& caption = QString(), KFileDialog::OperationMode type = KFileDialog::Opening,
|
||||
QWidget *parent= 0);
|
||||
KEncodingFileDialog(const QString &startDir = QString(),
|
||||
const QString &encoding = QString(),
|
||||
const QString &filter = QString(),
|
||||
const QString &caption = QString(), KFileDialog::OperationMode type = KFileDialog::Opening,
|
||||
QWidget *parent = nullptr);
|
||||
/**
|
||||
* Destructs the file dialog.
|
||||
*/
|
||||
|
|
@ -107,8 +107,8 @@ public:
|
|||
* @param startDir This can either be
|
||||
* @li The URL of the directory to start in.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -122,11 +122,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getOpenFileNameAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir= QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent= 0,
|
||||
const QString& caption = QString());
|
||||
static Result getOpenFileNameAndEncoding(const QString &encoding =QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString &filter = QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
/**
|
||||
* Creates a modal file dialog and returns the selected encoding and the selected
|
||||
|
|
@ -139,8 +139,8 @@ public:
|
|||
* @param startDir This can either be
|
||||
* @li The URL of the directory to start in.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -154,11 +154,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getOpenFileNamesAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir= QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent = 0,
|
||||
const QString& caption= QString());
|
||||
static Result getOpenFileNamesAndEncoding(const QString &encoding = QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString &filter = QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
/**
|
||||
* Creates a modal file dialog and returns the selected encoding and
|
||||
|
|
@ -171,8 +171,8 @@ public:
|
|||
* @param startDir This can either be
|
||||
* @li The URL of the directory to start in.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -186,11 +186,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getOpenUrlAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir = QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent= 0,
|
||||
const QString& caption = QString());
|
||||
static Result getOpenUrlAndEncoding(const QString &encoding = QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString &filter = QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
|
||||
|
||||
|
|
@ -206,8 +206,8 @@ public:
|
|||
* @param startDir This can either be
|
||||
* @li The URL of the directory to start in.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -221,11 +221,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getOpenUrlsAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir= QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent = 0,
|
||||
const QString& caption= QString());
|
||||
static Result getOpenUrlsAndEncoding(const QString &encoding = QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString &filter = QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
|
||||
|
||||
|
|
@ -242,8 +242,8 @@ public:
|
|||
* @li a relative path or a filename determining the
|
||||
* directory to start in and the file to be selected.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -257,11 +257,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getSaveFileNameAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir=QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent= 0,
|
||||
const QString& caption = QString());
|
||||
static Result getSaveFileNameAndEncoding(const QString &encoding = QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString &filter = QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -277,8 +277,8 @@ public:
|
|||
* @li a relative path or a filename determining the
|
||||
* directory to start in and the file to be selected.
|
||||
* @li QString() to start in the current working
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* directory, or the last directory where a file has been
|
||||
* selected.
|
||||
* @li ':<keyword>' to start in the directory last used
|
||||
* by a filedialog in the same application that specified
|
||||
* the same keyword.
|
||||
|
|
@ -292,11 +292,11 @@ public:
|
|||
* @param parent The widget the dialog will be centered on initially.
|
||||
* @param caption The name of the dialog widget.
|
||||
*/
|
||||
static Result getSaveUrlAndEncoding(const QString& encoding=QString(),
|
||||
const QString& startDir= QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent= 0,
|
||||
const QString& caption = QString());
|
||||
static Result getSaveUrlAndEncoding(const QString &encoding = QString(),
|
||||
const QString &startDir = QString(),
|
||||
const QString& filter= QString(),
|
||||
QWidget *parent = nullptr,
|
||||
const QString &caption = QString());
|
||||
|
||||
|
||||
|
||||
|
|
@ -304,4 +304,4 @@ private:
|
|||
KEncodingFileDialogPrivate* const d;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // KENCODINGFILEDIALOG_H
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue