All limereport items moved to LimeReport namespace

This commit is contained in:
Arin Alex 2016-03-04 04:53:34 +03:00
parent 16727fef18
commit 9dc3d4bfd8
38 changed files with 134 additions and 47 deletions

View File

@ -37,6 +37,8 @@
#include <stdexcept>
#include <QFileDialog>
namespace LimeReport{
ConnectionDialog::ConnectionDialog(LimeReport::IConnectionController *conControl, LimeReport::ConnectionDesc* connectionDesc, QWidget *parent) :
QDialog(parent),
ui(new Ui::ConnectionDialog),m_connection(connectionDesc),m_controller(conControl)
@ -147,3 +149,5 @@ void ConnectionDialog::on_toolButton_clicked()
{
ui->leDataBase->setText(QFileDialog::getOpenFileName());
}
} // namespace LimeReport

View File

@ -33,6 +33,8 @@
#include <QDialog>
#include "lrdatadesignintf.h"
namespace LimeReport{
namespace Ui {
class ConnectionDialog;
}
@ -63,4 +65,6 @@ private:
LimeReport::IConnectionController* m_controller;
};
} // namespace LimeReport
#endif // LRCONNECTIONDIALOG_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConnectionDialog</class>
<widget class="QDialog" name="ConnectionDialog">
<class>LimeReport::ConnectionDialog</class>
<widget class="QDialog" name="LimeReport::ConnectionDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -196,7 +196,7 @@
<connection>
<sender>pbOk</sender>
<signal>clicked()</signal>
<receiver>ConnectionDialog</receiver>
<receiver>LimeReport::ConnectionDialog</receiver>
<slot>slotAccept()</slot>
<hints>
<hint type="sourcelabel">
@ -212,7 +212,7 @@
<connection>
<sender>pbCancel</sender>
<signal>clicked()</signal>
<receiver>ConnectionDialog</receiver>
<receiver>LimeReport::ConnectionDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
@ -228,7 +228,7 @@
<connection>
<sender>pbCheckConnection</sender>
<signal>clicked()</signal>
<receiver>ConnectionDialog</receiver>
<receiver>LimeReport::ConnectionDialog</receiver>
<slot>slotCheckConnection()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -38,10 +38,11 @@
#include "lrreportdesignwidget.h"
#include "lrsqleditdialog.h"
namespace LimeReport{
namespace Ui {
class DataBrowser;
}
namespace LimeReport{
class DataBrowser : public QWidget, public IConnectionController
{

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DataBrowser</class>
<widget class="QWidget" name="DataBrowser">
<class>LimeReport::DataBrowser</class>
<widget class="QWidget" name="LimeReport::DataBrowser">
<property name="geometry">
<rect>
<x>0</x>

View File

@ -31,6 +31,8 @@
#include <QDebug>
#include <QMimeData>
namespace LimeReport {
DataBrowserTree::DataBrowserTree(QWidget *parent) :
QTreeWidget(parent){}
@ -45,3 +47,5 @@ QMimeData *DataBrowserTree::mimeData(const QList<QTreeWidgetItem *> items) const
}
return result;
}
} // namespace LimeReport

View File

@ -32,6 +32,9 @@
#include <QTreeWidget>
namespace LimeReport{
class DataBrowserTree : public QTreeWidget
{
Q_OBJECT
@ -45,4 +48,6 @@ public slots:
};
} // namespace LimeReport
#endif // LRDATABROWSERTREE_H

View File

@ -35,6 +35,8 @@
#include <QSqlDatabase>
#include <QMessageBox>
namespace LimeReport{
SQLEditDialog::SQLEditDialog(QWidget *parent, LimeReport::DataSourceManager *dataSources, SQLDialogMode dialogMode) :
QDialog(parent),
ui(new Ui::SQLEditDialog),m_datasources(dataSources),m_dialogMode(dialogMode), m_oldDatasourceName(""),
@ -341,3 +343,4 @@ void SQLEditDialog::hidePreview()
ui->pbHidePreview->setVisible(false);
}
} // namespace LimeReport

View File

@ -38,6 +38,8 @@
#include "lrdatasourcemanager.h"
#include "lrdatadesignintf.h"
namespace LimeReport{
namespace Ui {
class SQLEditDialog;
}
@ -106,4 +108,6 @@ struct SQLEditResult{
QList<LimeReport::FieldsCorrelation> fieldMap;
};
} // namespace LimeReport
#endif // LRSQLEDITDIALOG_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SQLEditDialog</class>
<widget class="QDialog" name="SQLEditDialog">
<class>LimeReport::SQLEditDialog</class>
<widget class="QDialog" name="LimeReport::SQLEditDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -807,7 +807,7 @@
<connection>
<sender>leDatasourceName</sender>
<signal>textChanged(QString)</signal>
<receiver>SQLEditDialog</receiver>
<receiver>LimeReport::SQLEditDialog</receiver>
<slot>slotDataSourceNameEditing()</slot>
<hints>
<hint type="sourcelabel">
@ -823,7 +823,7 @@
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>SQLEditDialog</receiver>
<receiver>LimeReport::SQLEditDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@ -839,7 +839,7 @@
<connection>
<sender>pushButton_2</sender>
<signal>clicked()</signal>
<receiver>SQLEditDialog</receiver>
<receiver>LimeReport::SQLEditDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -33,6 +33,7 @@
#include <QStringList>
namespace LimeReport{
void HtmlContext::fillTagVector(QString html)
{
QRegExp rx("<[^<]*>");

View File

@ -38,6 +38,8 @@
#include <QMenu>
#include <QScrollBar>
namespace LimeReport{
TextItemEditor::TextItemEditor(LimeReport::TextItem *item, LimeReport::PageDesignIntf *page, QSettings* settings, QWidget *parent) :
QWidget(parent),
ui(new Ui::TextItemEditor), m_textItem(item), m_page(page), m_settings(settings), m_ownedSettings(false), m_isReadingSetting(false)
@ -376,3 +378,4 @@ void TextItemEditor::slotScriptItemsSelectionChanged(const QModelIndex &to, cons
}
}
} // namespace LimeReport

View File

@ -37,6 +37,8 @@
#include "lrtextitem.h"
#include "lrpagedesignintf.h"
namespace LimeReport{
namespace Ui {
class TextItemEditor;
}
@ -102,4 +104,6 @@ private:
bool m_isReadingSetting;
};
} // namespace LimeReport
#endif // LRTEXTITEMEDITOR_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TextItemEditor</class>
<widget class="QWidget" name="TextItemEditor">
<class>LimeReport::TextItemEditor</class>
<widget class="QWidget" name="LimeReport::TextItemEditor">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>

View File

@ -30,6 +30,8 @@
#include "lraboutdialog.h"
#include "ui_lraboutdialog.h"
namespace LimeReport{
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
@ -42,3 +44,5 @@ AboutDialog::~AboutDialog()
{
delete ui;
}
} //namespace LimeReport

View File

@ -32,6 +32,8 @@
#include <QDialog>
namespace LimeReport{
namespace Ui {
class AboutDialog;
}
@ -48,4 +50,6 @@ private:
Ui::AboutDialog *ui;
};
} //namespace LimeReport
#endif // LRABOUTDIALOG_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialog</class>
<widget class="QDialog" name="AboutDialog">
<class>LimeReport::AboutDialog</class>
<widget class="QDialog" name="LimeReport::AboutDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -243,7 +243,7 @@ p, li { white-space: pre-wrap; }
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>AboutDialog</receiver>
<receiver>LimeReport::AboutDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -39,6 +39,7 @@
#include "lrgroupbands.h"
namespace LimeReport{
BandsManager::BandsManager(){}
QStringList BandsManager::bandNames()

View File

@ -1993,9 +1993,8 @@ void CommandGroup::addCommand(CommandIf::Ptr command, bool execute)
if (execute){
if (command->doIt())
m_commands.append(command);
}else{
} else
m_commands.append(command);
}
}
PrintRange::PrintRange(QAbstractPrintDialog::PrintRange rangeType, int fromPage, int toPage)

View File

@ -39,11 +39,12 @@
#include "serializators/lrstorageintf.h"
#include "serializators/lrxmlreader.h"
namespace LimeReport {
namespace Ui {
class PreviewReportWindow;
}
//using namespace LimeReport;
namespace LimeReport {
class PreviewReportWindow : public QMainWindow
{
Q_OBJECT

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PreviewReportWindow</class>
<widget class="QMainWindow" name="PreviewReportWindow">
<class>LimeReport::PreviewReportWindow</class>
<widget class="QMainWindow" name="LimeReport::PreviewReportWindow">
<property name="geometry">
<rect>
<x>0</x>
@ -41,7 +41,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>21</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuView">
@ -239,7 +239,7 @@
<connection>
<sender>actionPrint</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotPrint()</slot>
<hints>
<hint type="sourcelabel">
@ -255,7 +255,7 @@
<connection>
<sender>actionPriorPage</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotPriorPage()</slot>
<hints>
<hint type="sourcelabel">
@ -271,7 +271,7 @@
<connection>
<sender>actionNextPage</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotNextPage()</slot>
<hints>
<hint type="sourcelabel">
@ -287,7 +287,7 @@
<connection>
<sender>actionZoomIn</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotZoomIn()</slot>
<hints>
<hint type="sourcelabel">
@ -303,7 +303,7 @@
<connection>
<sender>actionZoomOut</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotZoomOut()</slot>
<hints>
<hint type="sourcelabel">
@ -319,7 +319,7 @@
<connection>
<sender>actionClosePreview</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
@ -335,7 +335,7 @@
<connection>
<sender>actionFirst_Page</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotFirstPage()</slot>
<hints>
<hint type="sourcelabel">
@ -351,7 +351,7 @@
<connection>
<sender>actionLast_Page</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotLastPage()</slot>
<hints>
<hint type="sourcelabel">
@ -367,7 +367,7 @@
<connection>
<sender>actionPrint_To_PDF</sender>
<signal>triggered()</signal>
<receiver>PreviewReportWindow</receiver>
<receiver>LimeReport::PreviewReportWindow</receiver>
<slot>slotPrintToPDF()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -339,7 +339,6 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen
}
}
} else {delete bandClone;}
if (patternBand->isFooter())
datasources()->clearGroupFunctionValues(patternBand->objectName());
}

View File

@ -3,11 +3,12 @@
#include <QDialog>
namespace LimeReport{
namespace Ui {
class SettingDialog;
}
namespace LimeReport{
class SettingDialog : public QDialog
{
Q_OBJECT

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingDialog</class>
<widget class="QDialog" name="SettingDialog">
<class>LimeReport::SettingDialog</class>
<widget class="QDialog" name="LimeReport::SettingDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>298</width>
<height>184</height>
<width>351</width>
<height>185</height>
</rect>
</property>
<property name="windowTitle">
@ -149,7 +149,7 @@
<connection>
<sender>bbOkCancel</sender>
<signal>accepted()</signal>
<receiver>SettingDialog</receiver>
<receiver>LimeReport::SettingDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@ -165,7 +165,7 @@
<connection>
<sender>bbOkCancel</sender>
<signal>rejected()</signal>
<receiver>SettingDialog</receiver>
<receiver>LimeReport::SettingDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -37,6 +37,8 @@
#include <QDesktopWidget>
#include "lrtextitempropertyeditor.h"
namespace LimeReport{
ButtonLineEditor::ButtonLineEditor(const QString &propertyName, QWidget *parent) :
QWidget(parent), m_overButton(false), m_propertyName(propertyName)
{
@ -130,3 +132,5 @@ void ButtonLineEditor::editingByEditorFinished()
setText(qobject_cast<TextItemPropertyEditor*>(sender())->text());
m_lineEdit->setFocus();
}
} //namespace LimeReport

View File

@ -38,6 +38,7 @@
#include <QDebug>
#include "lrtextitempropertyeditor.h"
namespace LimeReport{
class ButtonLineEditor : public QWidget
{
@ -64,4 +65,6 @@ private:
//QHBoxLayout* m_layout;
};
} //namespace LimeReport
#endif // LRBUTTONLINEEDIT_H

View File

@ -34,6 +34,8 @@
#include <QPaintEvent>
#include <QPainter>
namespace LimeReport{
ColorEditor::ColorEditor(QWidget *parent) :
QWidget(parent), m_buttonPressed(false)
{
@ -126,3 +128,5 @@ QSize ColorIndicator::sizeHint() const
{
return QSize(20,20);
}
} // namespace LimeReport

View File

@ -34,6 +34,8 @@
#include <QPushButton>
#include <QToolButton>
namespace LimeReport{
class ColorIndicator : public QWidget{
Q_OBJECT
public:
@ -69,4 +71,6 @@ private:
bool m_buttonPressed;
};
} // namespace LimeReport
#endif // LRCOLOREDITOR_H

View File

@ -37,6 +37,8 @@
#include <QKeyEvent>
#include "lrcomboboxeditor.h"
namespace LimeReport{
ComboBoxEditor::ComboBoxEditor(QWidget *parent, bool clearable) :
QWidget(parent),
m_comboBox(new InternalComboBox(this)),
@ -138,3 +140,5 @@ void ComboBoxEditor::resizeEvent(QResizeEvent *e)
if (m_buttonClear)
m_buttonClear->setMinimumHeight(e->size().height()-4);
}
} // namespace LimeReport

View File

@ -36,6 +36,8 @@
class QToolButton;
namespace LimeReport{
class InternalComboBox :public QComboBox{
Q_OBJECT
public:
@ -73,4 +75,6 @@ private:
bool m_settingValues;
};
} // namespace LimeReport
#endif // LRCOMBOBOXEDITOR_H

View File

@ -32,6 +32,8 @@
#include <QFontDialog>
#include <QDebug>
namespace LimeReport{
FontEditor::FontEditor(QWidget *parent) :
QWidget(parent)
{
@ -79,3 +81,5 @@ QString FontEditor::toString(const QFont &value) const
attribs+="]";
return value.family()+" "+QString::number(value.pointSize())+" "+attribs;
}
} // namespace LimeReport

View File

@ -34,6 +34,8 @@
#include <QPushButton>
#include <QToolButton>
namespace LimeReport{
class FontEditor : public QWidget
{
Q_OBJECT
@ -54,4 +56,6 @@ private:
QFont m_font;
};
} // namespace LimeReport
#endif // LRFONTEDITOR_H

View File

@ -31,6 +31,8 @@
#include <QFileDialog>
#include "lrimageeditor.h"
namespace LimeReport{
ImageEditor::ImageEditor(QWidget* parent)
:QWidget(parent)
{
@ -54,3 +56,5 @@ void ImageEditor::slotButtonClicked()
m_image.load(QFileDialog::getOpenFileName(this));
emit editingFinished();
}
} // namespace LimeReport

View File

@ -32,6 +32,8 @@
#include <QWidget>
#include <QPushButton>
namespace LimeReport{
class ImageEditor : public QWidget
{
Q_OBJECT
@ -49,4 +51,5 @@ private:
QImage m_image;
};
} // namespace LimeReport
#endif // LRIMAGEEDITOR_H

View File

@ -31,6 +31,8 @@
#include "ui_ltextitempropertyeditor.h"
#include <QCompleter>
namespace LimeReport{
TextItemPropertyEditor::TextItemPropertyEditor(QWidget *parent) :
QDialog(parent),
ui(new Ui::TextItemPropertyEditor)
@ -53,3 +55,5 @@ QString TextItemPropertyEditor::text()
{
return ui->textEdit->toPlainText();
}
} //namespace LimeReport

View File

@ -33,6 +33,8 @@
#include <QDialog>
#include <QWidget>
namespace LimeReport{
namespace Ui {
class TextItemPropertyEditor;
}
@ -53,4 +55,6 @@ private:
Ui::TextItemPropertyEditor *ui;
};
} //namespace LimeReport
#endif // ATEXTITEMPROPERTYEDITOR_H

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TextItemPropertyEditor</class>
<widget class="QDialog" name="TextItemPropertyEditor">
<class>LimeReport::TextItemPropertyEditor</class>
<widget class="QDialog" name="LimeReport::TextItemPropertyEditor">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
@ -43,7 +43,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>TextItemPropertyEditor</receiver>
<receiver>LimeReport::TextItemPropertyEditor</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@ -59,7 +59,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>TextItemPropertyEditor</receiver>
<receiver>LimeReport::TextItemPropertyEditor</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

View File

@ -34,7 +34,6 @@
namespace LimeReport{
ObjectBrowser::ObjectBrowser(QWidget *parent)
:QWidget(parent), m_changingItemSelection(false)
{