优化排版,增加选中多行Tab缩进
This commit is contained in:
parent
e7c76deceb
commit
d6968574ba
|
@ -22,6 +22,7 @@
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QTextBlock>
|
#include <QTextBlock>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
|
#include <QTextDocumentFragment>
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) :
|
MainWindow::MainWindow(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
|
@ -93,7 +94,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||||
|
|
||||||
// 写log
|
// 写log
|
||||||
QFile file("log.txt");
|
QFile file("log.txt");
|
||||||
if (file.open(QFile::WriteOnly|QIODevice::Append)) {
|
if (file.open(QFile::WriteOnly | QIODevice::Append)) {
|
||||||
file.write(log.toUtf8());
|
file.write(log.toUtf8());
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
|
@ -121,7 +122,7 @@ void MainWindow::on_action_about_triggered()
|
||||||
|
|
||||||
void MainWindow::on_action_changelog_triggered()
|
void MainWindow::on_action_changelog_triggered()
|
||||||
{
|
{
|
||||||
QString s = "1.10\n2019-08\n增加:字符数统计。\nHTML排版,增加选中文本分行插入td、tr、p、h1~h6的工具。\n\n1.9\n2019-04\n便签右键菜单增加打开文件路径。\n换行自动缩进。\n快捷键 Ctrl+/ 注释、取消注释选中行。\n保存窗口大小,保存字体设置,设置是否显示输出窗口。\n\n1.8\n2018-11\n使用系统主题图标代替Qt内置图标。\n\n1.7\n2018-10\n支持拖放打开多个文件。\n增加打开文件log。\n打开方式文件路径兼容深度文管和其他文管。\n\n1.6\n2018-09\n标签右键增加只读菜单。\n优化括号补全。\n\n1.5\n2018-08\n增加行号\n增加java文件编译命令\n\n1.4\n2018-07\n设置QTextEdit的Tab跳过的空格数为4个空格\n\n1.3\n2018-06\n增加调试窗口。\n\n1.2\n2018-05\n增加c、cpp的OpenGL编译命令。\n2018-05\n解决右键打开方式无法打开文件问题。\n增加运行python。\n2018-04\n增加打印功能。\n\n1.1\n2017-10\n增加获取文本编码(使用 file --mime-encoding 命令返回),但是没有解决乱码问题。\n排版实验。\n用文本框代替消息框显示更新日志。\n2017-07\n增加拖放打开文件。\n2017-06\n增加语法高亮。\n提取打开文件的相对路径,使Markdown预览能够载入相对路径图片。\n\n1.0\n2017-03\n支持命令行打开文件和打开方式打开文件。\n查找窗口填入选中文本。\n2017-02\n根据文件扩展名选择语法高亮方案。\nJS语法高亮实验成功!\nHTML语法高亮实验成功!\n增加设置字体。\n设置状态栏左右边距。\n2017-01\n实现全部替换。\n设置循环查找。\n增加查找替换窗体和功能。\n根据文件扩展名决定是否使用默认程序打开,如htm。\n优化保存、另存为和文本修动标题标记逻辑。\n增加撤销,重做,子窗标题文本改动标识。\n增加子窗体类,实现Ctrl+滚轮缩放和保存打开文件的路径。\n增加使用默认程序预览文件。\n把上一个打开或保存的路径设置为打开或保存对话框的默认路径和文件名。\n增加放大、缩小。\n增加文本光标变化信号,光标所在行列显示在状态栏第二栏。\n状态栏分为2栏\n修复没有子窗口时预览引起的崩溃。\n增加预览功能。\n保存成功。\n修改字体颜色,背景色成功。\n新建文件成功,打开文件载入成功。\n选用QMdiArea作为主控件,增加窗口标签、平铺、层叠菜单。 \n制作主要菜单。";
|
QString s = "1.11\n2019-12\n优化排版,增加选中多行Tab缩进。\n\n1.10\n2019-08\n增加:字符数统计。\nHTML排版,增加选中文本分行插入td、tr、p、h1~h6的工具。\n\n1.9\n2019-04\n便签右键菜单增加打开文件路径。\n换行自动缩进。\n快捷键 Ctrl+/ 注释、取消注释选中行。\n保存窗口大小,保存字体设置,设置是否显示输出窗口。\n\n1.8\n2018-11\n使用系统主题图标代替Qt内置图标。\n\n1.7\n2018-10\n支持拖放打开多个文件。\n增加打开文件log。\n打开方式文件路径兼容深度文管和其他文管。\n\n1.6\n2018-09\n标签右键增加只读菜单。\n优化括号补全。\n\n1.5\n2018-08\n增加行号\n增加java文件编译命令\n\n1.4\n2018-07\n设置QTextEdit的Tab跳过的空格数为4个空格\n\n1.3\n2018-06\n增加调试窗口。\n\n1.2\n2018-05\n增加c、cpp的OpenGL编译命令。\n2018-05\n解决右键打开方式无法打开文件问题。\n增加运行python。\n2018-04\n增加打印功能。\n\n1.1\n2017-10\n增加获取文本编码(使用 file --mime-encoding 命令返回),但是没有解决乱码问题。\n排版实验。\n用文本框代替消息框显示更新日志。\n2017-07\n增加拖放打开文件。\n2017-06\n增加语法高亮。\n提取打开文件的相对路径,使Markdown预览能够载入相对路径图片。\n\n1.0\n2017-03\n支持命令行打开文件和打开方式打开文件。\n查找窗口填入选中文本。\n2017-02\n根据文件扩展名选择语法高亮方案。\nJS语法高亮实验成功!\nHTML语法高亮实验成功!\n增加设置字体。\n设置状态栏左右边距。\n2017-01\n实现全部替换。\n设置循环查找。\n增加查找替换窗体和功能。\n根据文件扩展名决定是否使用默认程序打开,如htm。\n优化保存、另存为和文本修动标题标记逻辑。\n增加撤销,重做,子窗标题文本改动标识。\n增加子窗体类,实现Ctrl+滚轮缩放和保存打开文件的路径。\n增加使用默认程序预览文件。\n把上一个打开或保存的路径设置为打开或保存对话框的默认路径和文件名。\n增加放大、缩小。\n增加文本光标变化信号,光标所在行列显示在状态栏第二栏。\n状态栏分为2栏\n修复没有子窗口时预览引起的崩溃。\n增加预览功能。\n保存成功。\n修改字体颜色,背景色成功。\n新建文件成功,打开文件载入成功。\n选用QMdiArea作为主控件,增加窗口标签、平铺、层叠菜单。 \n制作主要菜单。";
|
||||||
QDialog *dialog = new QDialog;
|
QDialog *dialog = new QDialog;
|
||||||
dialog->setWindowTitle("更新历史");
|
dialog->setWindowTitle("更新历史");
|
||||||
dialog->setFixedSize(400, 300);
|
dialog->setFixedSize(400, 300);
|
||||||
|
@ -171,14 +172,14 @@ void MainWindow::on_action_new_triggered()
|
||||||
MdiChild *child = new MdiChild(this);
|
MdiChild *child = new MdiChild(this);
|
||||||
QMdiSubWindow *window = ui->mdiArea->addSubWindow(child);
|
QMdiSubWindow *window = ui->mdiArea->addSubWindow(child);
|
||||||
QMenu *menu = window->systemMenu();
|
QMenu *menu = window->systemMenu();
|
||||||
QAction *action_readonly = new QAction("只读",menu);
|
QAction *action_readonly = new QAction("只读", menu);
|
||||||
action_readonly->setCheckable(true);
|
action_readonly->setCheckable(true);
|
||||||
menu->addAction(action_readonly);
|
menu->addAction(action_readonly);
|
||||||
connect(action_readonly, SIGNAL(triggered(bool)), child, SLOT(setReadOnlyA(bool)));
|
connect(action_readonly, SIGNAL(triggered(bool)), child, SLOT(setReadOnlyA(bool)));
|
||||||
|
|
||||||
QPalette plt = palette();
|
QPalette plt = palette();
|
||||||
plt.setColor(QPalette::Text,QColor(Qt::white));
|
plt.setColor(QPalette::Text, QColor(Qt::white));
|
||||||
plt.setBrush(QPalette::Base,QBrush(Qt::black));
|
plt.setBrush(QPalette::Base, QBrush(Qt::black));
|
||||||
child->setPalette(plt);
|
child->setPalette(plt);
|
||||||
//child->selectAll();
|
//child->selectAll();
|
||||||
//child->setFontPointSize(13);
|
//child->setFontPointSize(13);
|
||||||
|
@ -191,7 +192,7 @@ void MainWindow::on_action_new_triggered()
|
||||||
|
|
||||||
void MainWindow::on_action_open_triggered()
|
void MainWindow::on_action_open_triggered()
|
||||||
{
|
{
|
||||||
if (filename == "") {
|
if (path == "") {
|
||||||
filename = QFileDialog::getOpenFileName(this, "打开文本", ".");
|
filename = QFileDialog::getOpenFileName(this, "打开文本", ".");
|
||||||
} else {
|
} else {
|
||||||
filename = QFileDialog::getOpenFileName(this, "打开文本", path);
|
filename = QFileDialog::getOpenFileName(this, "打开文本", path);
|
||||||
|
@ -203,6 +204,7 @@ void MainWindow::on_action_open_triggered()
|
||||||
|
|
||||||
void MainWindow::open(QString fileName)
|
void MainWindow::open(QString fileName)
|
||||||
{
|
{
|
||||||
|
path = fileName;
|
||||||
MdiChild *child = new MdiChild(this);
|
MdiChild *child = new MdiChild(this);
|
||||||
connect(child, SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChange()));
|
connect(child, SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChange()));
|
||||||
QMdiSubWindow *window = ui->mdiArea->addSubWindow(child);
|
QMdiSubWindow *window = ui->mdiArea->addSubWindow(child);
|
||||||
|
@ -467,23 +469,24 @@ void MainWindow::replaceAll()
|
||||||
|
|
||||||
void MainWindow::on_action_indent_triggered()
|
void MainWindow::on_action_indent_triggered()
|
||||||
{
|
{
|
||||||
QString suffix = QFileInfo(path).suffix().toLower();
|
|
||||||
QTextCursor cursor = ((QTextEdit*)(ui->mdiArea->currentSubWindow()->widget()))->textCursor();
|
QTextCursor cursor = ((QTextEdit*)(ui->mdiArea->currentSubWindow()->widget()))->textCursor();
|
||||||
QString s = cursor.selectedText();
|
QString s = cursor.selection().toPlainText();
|
||||||
if (suffix == "htm" || suffix == "html") {
|
QStringList SL = s.split("\n");
|
||||||
//s = s.trimmed();
|
int ci = 0;
|
||||||
//s = s.replace(QRegExp("[\\s]+"), ""); // \\s表示空格,回车,换行等空白符, +号表示匹配一个或多个
|
s = "";
|
||||||
s = s.replace(QRegExp("[\\s]+(<td>)"), "\\1"); //删除<td>前面空白
|
for (int i=0; i<SL.length(); i++) {
|
||||||
s = s.replace(QRegExp("[\\s]+(</td>)"), "\\1"); //删除</td>前面空白
|
QString st = SL.at(i).trimmed();
|
||||||
s = s.replace(QRegExp("(</tr>)[\\s]+"), "\\1\n"); //删除</tr>后面空白后换行
|
if (st.startsWith("}")) ci--;
|
||||||
} else if (suffix == "c" || suffix == "cpp"){
|
st = "";
|
||||||
s = s.replace("{", "{\n");
|
for (int j=0; j<ci; j++) {
|
||||||
s = s.replace("}", "}\n");
|
st += "\t";
|
||||||
s = s.replace("[", "[\n");
|
}
|
||||||
s = s.replace("]", "]\n");
|
st += SL.at(i).trimmed();
|
||||||
s = s.replace(",", ",\n");
|
if (st.endsWith("{")) ci++;
|
||||||
|
if (i<SL.length()-1) st.append("\n");
|
||||||
|
qDebug() << st;
|
||||||
|
s += st;
|
||||||
}
|
}
|
||||||
//qDebug() << s;
|
|
||||||
cursor.insertText(s);
|
cursor.insertText(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -732,15 +735,6 @@ void MainWindow::anchorClick(QUrl url)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_action_h1_triggered()
|
|
||||||
{
|
|
||||||
QMdiSubWindow *window = ui->mdiArea->currentSubWindow();
|
|
||||||
if(window != 0){
|
|
||||||
MdiChild *child = (MdiChild*)(window->widget());
|
|
||||||
child->insertH1();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::on_action_tr_triggered()
|
void MainWindow::on_action_tr_triggered()
|
||||||
{
|
{
|
||||||
QMdiSubWindow *window = ui->mdiArea->currentSubWindow();
|
QMdiSubWindow *window = ui->mdiArea->currentSubWindow();
|
||||||
|
|
|
@ -61,7 +61,6 @@ private slots:
|
||||||
void on_action_find_triggered();
|
void on_action_find_triggered();
|
||||||
void on_action_indent_triggered();
|
void on_action_indent_triggered();
|
||||||
void on_action_font_triggered();
|
void on_action_font_triggered();
|
||||||
void on_action_h1_triggered();
|
|
||||||
void on_action_tr_triggered();
|
void on_action_tr_triggered();
|
||||||
void on_action_td_triggered();
|
void on_action_td_triggered();
|
||||||
void on_action_p_triggered();
|
void on_action_p_triggered();
|
||||||
|
|
57
mdichild.cpp
57
mdichild.cpp
|
@ -136,14 +136,14 @@ void MdiChild::keyPressEvent(QKeyEvent *e)
|
||||||
} else if ((e->modifiers() & Qt::ControlModifier) && e->key() == Qt::Key_Slash) {// Ctrl+/ 注释选中行
|
} else if ((e->modifiers() & Qt::ControlModifier) && e->key() == Qt::Key_Slash) {// Ctrl+/ 注释选中行
|
||||||
QString s = textCursor().selection().toPlainText();
|
QString s = textCursor().selection().toPlainText();
|
||||||
QStringList SL = s.split("\n");
|
QStringList SL = s.split("\n");
|
||||||
for(int i=0; i<SL.length(); i++){
|
for (int i=0; i<SL.length(); i++) {
|
||||||
if(SL.at(i).trimmed().startsWith("//")){
|
if (SL.at(i).trimmed().startsWith("//")) {
|
||||||
s = SL.at(i);
|
s = SL.at(i);
|
||||||
s.replace("//","");
|
s.replace("//","");
|
||||||
}else{
|
} else {
|
||||||
s = "//" + SL.at(i);
|
s = "//" + SL.at(i);
|
||||||
}
|
}
|
||||||
if(i<SL.length()-1) s.append("\n");
|
if (i<SL.length()-1) s.append("\n");
|
||||||
textCursor().insertText(s);
|
textCursor().insertText(s);
|
||||||
}
|
}
|
||||||
} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {//auto indent
|
} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {//auto indent
|
||||||
|
@ -156,6 +156,16 @@ void MdiChild::keyPressEvent(QKeyEvent *e)
|
||||||
}else{
|
}else{
|
||||||
textCursor().insertText("\n" + ws); //插入换行 + 行首空白字符(不缩进)
|
textCursor().insertText("\n" + ws); //插入换行 + 行首空白字符(不缩进)
|
||||||
}
|
}
|
||||||
|
} else if (e->key() == Qt::Key_Tab) { //选中每行前插入一个tab
|
||||||
|
QString s = textCursor().selection().toPlainText();
|
||||||
|
QStringList SL = s.split("\n");
|
||||||
|
s = "";
|
||||||
|
for (int i=0; i<SL.length(); i++) {
|
||||||
|
QString st = "\t" + SL.at(i);
|
||||||
|
if (i<SL.length()-1) st.append("\n");
|
||||||
|
s += st;
|
||||||
|
}
|
||||||
|
textCursor().insertText(s);
|
||||||
} else {
|
} else {
|
||||||
return QPlainTextEdit::keyPressEvent(e);
|
return QPlainTextEdit::keyPressEvent(e);
|
||||||
}
|
}
|
||||||
|
@ -228,30 +238,15 @@ void MdiChild::setReadOnlyA(bool b)
|
||||||
setReadOnly(b);
|
setReadOnly(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MdiChild::insertH1()
|
|
||||||
{
|
|
||||||
QString s = textCursor().selection().toPlainText(); //可以显示换行符
|
|
||||||
QStringList SL = s.split("\n");
|
|
||||||
s = "";
|
|
||||||
for(int i=0; i<SL.length(); i++){
|
|
||||||
if(SL.at(i) != ""){
|
|
||||||
s += "<h1>" + SL.at(i) + "</h1>";
|
|
||||||
if(i < SL.length()-1)
|
|
||||||
s += "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
textCursor().insertText(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MdiChild::insertH(QString h)
|
void MdiChild::insertH(QString h)
|
||||||
{
|
{
|
||||||
QString s = textCursor().selection().toPlainText(); //可以显示换行符
|
QString s = textCursor().selection().toPlainText(); //可以显示换行符
|
||||||
QStringList SL = s.split("\n");
|
QStringList SL = s.split("\n");
|
||||||
s = "";
|
s = "";
|
||||||
for(int i=0; i<SL.length(); i++){
|
for (int i=0; i<SL.length(); i++) {
|
||||||
if(SL.at(i) != ""){
|
if (SL.at(i) != "") {
|
||||||
s += "<" + h +">" + SL.at(i) + "</" + h + ">";
|
s += "<" + h +">" + SL.at(i) + "</" + h + ">";
|
||||||
if(i < SL.length()-1)
|
if (i < SL.length()-1)
|
||||||
s += "\n";
|
s += "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -263,10 +258,10 @@ void MdiChild::insertTR()
|
||||||
QString s = textCursor().selection().toPlainText();
|
QString s = textCursor().selection().toPlainText();
|
||||||
QStringList SL = s.split("\n");
|
QStringList SL = s.split("\n");
|
||||||
s = "";
|
s = "";
|
||||||
for(int i=0; i<SL.length(); i++){
|
for (int i=0; i<SL.length(); i++) {
|
||||||
if(SL.at(i) != ""){
|
if (SL.at(i) != "") {
|
||||||
s += "<tr>" + SL.at(i) + "</tr>";
|
s += "<tr>" + SL.at(i) + "</tr>";
|
||||||
if(i < SL.length()-1)
|
if (i < SL.length()-1)
|
||||||
s += "\n";
|
s += "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -278,10 +273,10 @@ void MdiChild::insertTD()
|
||||||
QString s = textCursor().selection().toPlainText();
|
QString s = textCursor().selection().toPlainText();
|
||||||
QStringList SL = s.split("\n");
|
QStringList SL = s.split("\n");
|
||||||
s = "";
|
s = "";
|
||||||
for(int i=0; i<SL.length(); i++){
|
for (int i=0; i<SL.length(); i++) {
|
||||||
if(SL.at(i) != ""){
|
if (SL.at(i) != "") {
|
||||||
s += "<td>" + SL.at(i) + "</td>";
|
s += "<td>" + SL.at(i) + "</td>";
|
||||||
if(i < SL.length()-1)
|
if (i < SL.length()-1)
|
||||||
s += "\n";
|
s += "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -293,10 +288,10 @@ void MdiChild::insertP()
|
||||||
QString s = textCursor().selection().toPlainText();
|
QString s = textCursor().selection().toPlainText();
|
||||||
QStringList SL = s.split("\n");
|
QStringList SL = s.split("\n");
|
||||||
s = "";
|
s = "";
|
||||||
for(int i=0; i<SL.length(); i++){
|
for (int i=0; i<SL.length(); i++) {
|
||||||
if(SL.at(i) != ""){
|
if (SL.at(i) != "") {
|
||||||
s += "<p>" + SL.at(i) + "</p>";
|
s += "<p>" + SL.at(i) + "</p>";
|
||||||
if(i < SL.length()-1)
|
if (i < SL.length()-1)
|
||||||
s += "\n";
|
s += "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,6 @@ public:
|
||||||
QString path, scodec;
|
QString path, scodec;
|
||||||
void lineNumberAreaPaintEvent(QPaintEvent *event);
|
void lineNumberAreaPaintEvent(QPaintEvent *event);
|
||||||
int lineNumberAreaWidth();
|
int lineNumberAreaWidth();
|
||||||
void insertH1();
|
|
||||||
void insertH(QString h);
|
void insertH(QString h);
|
||||||
void insertTR();
|
void insertTR();
|
||||||
void insertTD();
|
void insertTD();
|
||||||
|
|
Loading…
Reference in New Issue