X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fedit%2Feditor.cpp;h=2315c0e1f5d75b9b66b7e4f6bb409ce7622502a9;hb=HEAD;hp=563a3e60cd18853ca6dfc0dc3e1e84bb394e6fd8;hpb=3a3287b8425c355dbb54fffe6b546367ce32c8ac;p=vlp.git

diff --git a/src/edit/editor.cpp b/src/edit/editor.cpp
index 563a3e6..2315c0e 100644
--- a/src/edit/editor.cpp
+++ b/src/edit/editor.cpp
@@ -5,7 +5,6 @@
 #include <QtGui/QFileDialog>
 #include <QtGui/QColor>
 #include <QtGui/QPalette>
-#include <QtGui/QCloseEvent>
 #include <QtGui/QTextDocument>
 #include <QtGui/QMainWindow>
 #include <QtGui/QStatusBar>
@@ -17,6 +16,7 @@
 #include "ProgramStructureDialog.h"
 #include "UnitStructureDialog.h"
 #include "PreferencesDialog.h"
+#include "FindDialog.h"
 
 #include "editor.h"
 
@@ -35,6 +35,7 @@ Editor::Editor(int argc, char **argv)
 
 	if (argc > 1) {
 		strcpy(HomeDir, argv[1]);
+		fprintf(stderr, "EDIT: HomeDir inited with: %s (%s)\n", HomeDir, argv[1]);
 	}
 
 	find_text = "";
@@ -87,9 +88,10 @@ void Editor::load(const char *fileName)
 	editor->clear();
 
 	QTextStream textStream(&file);
-	while (!file.atEnd()) {
-		editor->append(textStream.readLine());
-	}
+	editor->append(textStream.readAll());
+// 	while (!file.atEnd()) {
+// 		editor->append(textStream.readLine());
+// 	}
 
 	file.close();
 
@@ -173,7 +175,8 @@ void Editor::compile(int mode)
 void Editor::on_actionNew_triggered()
 {
 	on_actionClear_all_triggered();
-	fname.sprintf("%s", "");}
+	fname.sprintf("%s", "");
+}
 
 /**
  * Displays additional window 
@@ -248,44 +251,18 @@ void Editor::on_actionClear_all_triggered()
  */
 void Editor::on_actionFind_triggered()
 {
-	QDialog dlg(this, Qt::Dialog);
-
-	QLineEdit *tmpQLineEdit;
-	tmpQLineEdit = new QLineEdit("", &dlg);
-	tmpQLineEdit->setGeometry(60, 10, 180, 30);
-
-	QLabel *tmpQLabel;
-	tmpQLabel = new QLabel(&dlg);
-	tmpQLabel->setGeometry(10, 10, 50, 30);
-
-	tmpQLabel->setText("Text:");
-
-	QCheckBox *tmpQRadioButton;
-	tmpQRadioButton = new QCheckBox("Case sensitive", &dlg);
-	tmpQRadioButton->setGeometry(70, 50, 150, 30);
-	tmpQRadioButton->setAutoRepeat(FALSE);
+	dialog::FindDialog dialog(this);
 
-	QPushButton *okbtn, *cbtn;
-	okbtn = new QPushButton("Find", &dlg);
-	okbtn->setGeometry(260, 10, 100, 30);
-	okbtn->setDefault(TRUE);
-	connect(okbtn,SIGNAL(clicked()), &dlg, SLOT(accept()));
-
-	cbtn = new QPushButton("Close", &dlg);
-	cbtn->setGeometry(260, 50, 100, 30);
-	connect(cbtn, SIGNAL(clicked()), &dlg, SLOT(reject()));
-
-	dlg.resize(380, 90);
-
-	if (dlg.exec()) {
-		sensitive = tmpQRadioButton->isChecked();
-		find_text = tmpQLineEdit->text();
+	if (dialog.exec()) {
+		sensitive = dialog.isCaseSensitive();
+		find_text = dialog.getSearchText();
 		
 		QTextDocument::FindFlags flags = 0;
 		
 		if (sensitive) {
 			flags |= QTextDocument::FindCaseSensitively;
 		}
+
 		editor->find(find_text, flags);
 	}
 }
@@ -312,7 +289,7 @@ void Editor::on_actionFind_Next_triggered()
  */
 void Editor::on_actionPreferences_triggered()
 {
-	PreferencesDialog dialog(this);
+	dialog::PreferencesDialog dialog(this);
 
 	dialog.setCompilerPath(compiler_path);
 	dialog.setFilesPath(file_path);
@@ -353,7 +330,7 @@ void Editor::on_actionCompile_Gen_triggered()
 
 void Editor::on_actionProgram_structure_triggered()
 {
-	ProgramStructureDialog dialog(this);
+	dialog::ProgramStructureDialog dialog(this);
 
 	if (dialog.exec()) {
 		editor->textCursor().insertText(dialog.getCode());
@@ -362,7 +339,7 @@ void Editor::on_actionProgram_structure_triggered()
 
 void Editor::on_actionUnit_structure_triggered()
 {
-	UnitStructureDialog dialog(this);
+	dialog::UnitStructureDialog dialog(this);
 
 	if (dialog.exec()) {
 		editor->textCursor().insertText(dialog.getCode());