Commit 250e0a6f authored by Floreal C's avatar Floreal C

merge 1.2 old branch

parents cd14646f 5fbe431c
This diff is collapsed.
......@@ -26,6 +26,7 @@
#include "insertvideo.h"
#include "insertpicture.h"
#include "filedownloader.h"
#include "qinputmultiline.h"
#include <QMainWindow>
......@@ -189,6 +190,14 @@ private slots:
void on_description_selectionChanged();
void on_editIngr_customContextMenuRequested(const QPoint &pos);
void on_editMat_customContextMenuRequested(const QPoint &pos);
void on_editPrep_customContextMenuRequested(const QPoint &pos);
void on_editCons_customContextMenuRequested(const QPoint &pos);
public slots:
void init();
void config();
......@@ -262,6 +271,10 @@ private:
void deleteBalsInLineEdit(QLineEdit* areaTxt);
void deleteBalsInPlainTextEdit(QPlainTextEdit* areaTxt);
void updatePrepItems();
void insertIngredient(QString text);
void insertMateriel(QString text);
void insertPreparation(QString text);
void insertConseil(QString text);
};
#endif // CECWRITER_H
......@@ -28,7 +28,8 @@ SOURCES += main.cpp\
spellchecker.cpp \
filedownloader.cpp \
insertvideo.cpp \
insertpicture.cpp
insertpicture.cpp \
qinputmultiline.cpp
HEADERS += cecwriter.h \
options.h \
......@@ -45,7 +46,8 @@ HEADERS += cecwriter.h \
spellchecker.h \
filedownloader.h \
insertvideo.h \
insertpicture.h
insertpicture.h \
qinputmultiline.h
FORMS += cecwriter.ui \
options.ui \
......@@ -55,7 +57,8 @@ FORMS += cecwriter.ui \
sendautomatic.ui \
spellcheckdialog.ui \
insertvideo.ui \
insertpicture.ui
insertpicture.ui \
qinputmultiline.ui
RESOURCES += \
Ressources.qrc
......
......@@ -1370,6 +1370,9 @@ left: 10px; padding: 0 3px;}</string>
<height>30</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
......@@ -1469,6 +1472,9 @@ left: 10px; padding: 0 3px;}</string>
<height>30</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
</widget>
</item>
</layout>
......@@ -1655,6 +1661,9 @@ left: 10px; padding: 0 3px;}</string>
<height>51</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
</widget>
</item>
</layout>
......@@ -1754,6 +1763,9 @@ left: 10px; padding: 0 3px;}</string>
<height>37</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
</widget>
</item>
</layout>
......
images/splash.jpg

308 KB | W: | H:

images/splash.jpg

293 KB | W: | H:

images/splash.jpg
images/splash.jpg
images/splash.jpg
images/splash.jpg
  • 2-up
  • Swipe
  • Onion skin
......@@ -71,7 +71,7 @@ QString correction = ""; //Path to the dictionnary (prefix of .dic and .aff file
bool cancel = false; //Keep if user cancel orthographical correction
bool cecPrinter = false; //CeC Printer status
QString VERSION = "1.1.0";
QString VERSION = "1.2.0";
QString QTVERSION;
QMap<QString, QString> liens; //Contains all links registered for one recipe
......
#include "qinputmultiline.h"
#include "ui_qinputmultiline.h"
QInputMultiline::QInputMultiline(QWidget *parent, QString title, QString message, QString text, bool wordWrap, int width, int height) :
QDialog(parent),
ui(new Ui::QInputMultiline)
{
ui->setupUi(this);
this->setWindowTitle(title);
ui->message->setText(message + " :");
if (!wordWrap)
ui->text->setWordWrapMode(QTextOption::NoWrap);
ui->text->setPlainText(text);
this->text = "";
this->setBaseSize(width, height);
}
QInputMultiline::~QInputMultiline()
{
delete ui;
}
void QInputMultiline::on_buttonBox_accepted()
{
this->text = ui->text->toPlainText();
this->close();
}
void QInputMultiline::on_buttonBox_rejected()
{
this->close();
}
#ifndef QINPUTMULTILINE_H
#define QINPUTMULTILINE_H
#include <QDialog>
namespace Ui {
class QInputMultiline;
}
class QInputMultiline : public QDialog
{
Q_OBJECT
public:
explicit QInputMultiline(QWidget *parent = 0, QString title = "Dialog", QString message = "Entrez le texte", QString text = "", bool wordWrap = true, int width=300, int height=400);
~QInputMultiline();
private:
Ui::QInputMultiline *ui;
public:
QString text;
private slots:
void on_buttonBox_accepted();
void on_buttonBox_rejected();
};
#endif // QINPUTMULTILINE_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QInputMultiline</class>
<widget class="QDialog" name="QInputMultiline">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="message">
<property name="text">
<string>Entrez le texte :</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="text"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
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