WebSVN - OpenInventory - Различия - Редакция 200 и 201


#include "fileform.h"
#include "ui_fileform.h"
#include "mainwindow.h"

FileForm::FileForm(QWidget *parent) :
    QWidget(parent),
    ui(new Ui::FileForm)
{
    ui->setupUi(this);
    FileForm::fdataIsChanged = false;
}

FileForm::~FileForm()
{
    delete ui;
}

void FileForm::changeEvent(QEvent *e)
{
    QWidget::changeEvent(e);
    switch (e->type()) {
    case QEvent::LanguageChange:
        ui->retranslateUi(this);
        break;
    default:
        break;
    }
}



void FileForm::on_pushButton_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"
    QString  fileName;
    QFile file;
    QByteArray data_tmp;

        fileName = QFileDialog::getOpenFileName(this,
         tr("Open Image"), "", tr("All Files (*.*);;Image Files (*.png *.jpg *.bmp);;Text files (*.txt);;XML files (*.xml)")); //Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)

    if (fileName.isEmpty()) return;
    file.setFileName(fileName);
    if (!file.open(QIODevice::ReadOnly)) return;
    Data.clear();
    // Data = file.readAll();
    QDataStream out(&Data,QIODevice::ReadWrite);
    out << fileName;
    data_tmp = file.readAll();
    out << data_tmp;
    file.close();
 
    FileForm::fdataIsChanged = true;

}

void FileForm::on_pushButton_2_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"

    Data.clear();
    FileForm::fdataIsChanged = true;

}

void FileForm::on_pushButton_3_clicked(){          // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"

    QByteArray data_tmp;
    QFile file;
    QDataStream out(&Data,QIODevice::ReadOnly);
    QString fileName;
    if (Data.isEmpty()) return;
    out >> fileName;
    fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
                                                     fileName,
                                                     tr("All Files (*.*);;Image Files (*.png *.jpg *.bmp);;Text files (*.txt);;XML files (*.xml)"));


    if (fileName.isEmpty()) return;


        file.setFileName(fileName);
        if (!file.open(QIODevice::WriteOnly)) return;


    // Data = file.readAll();

  //  out.device()->reset();



    data_tmp.clear();
    out >> data_tmp;
    int count;
    count = file.write(data_tmp);
    int size;
    size = file.size();
    file.close();
    FileForm::fdataIsChanged = true;



}
 

Редакция 200	Редакция 201
1	#include "fileform.h"	1	#include "fileform.h"
2	#include "ui_fileform.h"	2	#include "ui_fileform.h"
3	#include "mainwindow.h"	3	#include "mainwindow.h"
4		4
5	FileForm::FileForm(QWidget *parent) :	5	FileForm::FileForm(QWidget *parent) :
6	QWidget(parent),	6	QWidget(parent),
7	ui(new Ui::FileForm)	7	ui(new Ui::FileForm)
8	{	8	{
9	ui->setupUi(this);	9	ui->setupUi(this);
-		10	FileForm::fdataIsChanged = false;
10	}	11	}
11		12
12	FileForm::~FileForm()	13	FileForm::~FileForm()
13	{	14	{
14	delete ui;	15	delete ui;
15	}	16	}
16		17
17	void FileForm::changeEvent(QEvent *e)	18	void FileForm::changeEvent(QEvent *e)
18	{	19	{
19	QWidget::changeEvent(e);	20	QWidget::changeEvent(e);
20	switch (e->type()) {	21	switch (e->type()) {
21	case QEvent::LanguageChange:	22	case QEvent::LanguageChange:
22	ui->retranslateUi(this);	23	ui->retranslateUi(this);
23	break;	24	break;
24	default:	25	default:
25	break;	26	break;
26	}	27	}
27	}	28	}
28		29
29		30
30		31
31	void FileForm::on_pushButton_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"	32	void FileForm::on_pushButton_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Îòêðûòü ôàéë"
32	QString fileName;	33	QString fileName;
33	QFile file;	34	QFile file;
34	QByteArray data_tmp;	35	QByteArray data_tmp;
35		36
36	fileName = QFileDialog::getOpenFileName(this,	37	fileName = QFileDialog::getOpenFileName(this,
37	tr("Open Image"), "", tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (.xml)")); //Images (.png .xpm .jpg);;Text files (.txt);;XML files (.xml)	38	tr("Open Image"), "", tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (.xml)")); //Images (.png .xpm .jpg);;Text files (.txt);;XML files (.xml)
38		39
39	if (fileName.isEmpty()) return;	40	if (fileName.isEmpty()) return;
40	file.setFileName(fileName);	41	file.setFileName(fileName);
41	if (!file.open(QIODevice::ReadOnly)) return;	42	if (!file.open(QIODevice::ReadOnly)) return;
42	Data.clear();	43	Data.clear();
43	// Data = file.readAll();	44	// Data = file.readAll();
44	QDataStream out(&Data,QIODevice::ReadWrite);	45	QDataStream out(&Data,QIODevice::ReadWrite);
45	out << fileName;	46	out << fileName;
46	data_tmp = file.readAll();	47	data_tmp = file.readAll();
47	out << data_tmp;	48	out << data_tmp;
48	file.close();	49	file.close();
49		-
-		50	FileForm::fdataIsChanged = true;
50		51
51	}	52	}
52		53
53	void FileForm::on_pushButton_2_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"	54	void FileForm::on_pushButton_2_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ôàéë"
-		55
54	Data.clear();	56	Data.clear();
-		57	FileForm::fdataIsChanged = true;
55		58
56	}	59	}
57		60
58	void FileForm::on_pushButton_3_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"	61	void FileForm::on_pushButton_3_clicked(){ // îáðàáîò÷èê íàæàòèÿ êíîïêè "Ñîõðàíèòü ôàéë"
59		62
60	QByteArray data_tmp;	63	QByteArray data_tmp;
61	QFile file;	64	QFile file;
62	QDataStream out(&Data,QIODevice::ReadOnly);	65	QDataStream out(&Data,QIODevice::ReadOnly);
63	QString fileName;	66	QString fileName;
64	if (Data.isEmpty()) return;	67	if (Data.isEmpty()) return;
65	out >> fileName;	68	out >> fileName;
66	fileName = QFileDialog::getSaveFileName(this, tr("Save File"),	69	fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
67	fileName,	70	fileName,
68	tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (*.xml)"));	71	tr("All Files (.);;Image Files (.png .jpg .bmp);;Text files (.txt);;XML files (*.xml)"));
69		72
70		73
71	if (fileName.isEmpty()) return;	74	if (fileName.isEmpty()) return;
72		75
73		76
74	file.setFileName(fileName);	77	file.setFileName(fileName);
75	if (!file.open(QIODevice::WriteOnly)) return;	78	if (!file.open(QIODevice::WriteOnly)) return;
76		79
77		80
78	// Data = file.readAll();	81	// Data = file.readAll();
79		82
80	// out.device()->reset();	83	// out.device()->reset();
81		84
82		85
83		86
84	data_tmp.clear();	87	data_tmp.clear();
85	out >> data_tmp;	88	out >> data_tmp;
86	int count;	89	int count;
87	count = file.write(data_tmp);	90	count = file.write(data_tmp);
88	int size;	91	int size;
89	size = file.size();	92	size = file.size();
90	file.close();	93	file.close();
-		94	FileForm::fdataIsChanged = true;
91		95
92		96
93		97
94	}	98	}
95		99

Хранилища Subversion OpenInventory

(root)/trunk/DBViewer/fileform.cpp - Редакция 200 → 201