diff options
author | Weblate <noreply@weblate.org> | 2017-09-20 21:24:55 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-09-20 21:24:55 +0000 |
commit | 3b0a6306ef992d753a6d082fdb8685dd009e50bc (patch) | |
tree | e83745a03f39e2ae106550f8ef7aaec87cd1dfd3 /src-qt5/desktop-utils/lumina-textedit | |
parent | Translated using Weblate (Catalan) (diff) | |
parent | Merge branch 'master' of http://github.com/trueos/lumina (diff) | |
download | lumina-3b0a6306ef992d753a6d082fdb8685dd009e50bc.tar.gz lumina-3b0a6306ef992d753a6d082fdb8685dd009e50bc.tar.bz2 lumina-3b0a6306ef992d753a6d082fdb8685dd009e50bc.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-textedit')
-rw-r--r-- | src-qt5/desktop-utils/lumina-textedit/MainUI.cpp | 14 | ||||
-rw-r--r-- | src-qt5/desktop-utils/lumina-textedit/MainUI.ui | 7 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp index 52a29c01..4c2ce0bd 100644 --- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp @@ -496,11 +496,11 @@ void MainUI::closeEvent(QCloseEvent *ev){ unsaved << tmp->currentFile(); } } - bool quitnow = unsaved.isEmpty(); - if(!quitnow && !ui->actionShow_Popups->isChecked()){ quitnow = true; } - if(!quitnow){ - quitnow = (QMessageBox::Yes == QMessageBox::question(this, tr("Lose Unsaved Changes?"), QString(tr("There are unsaved changes.\nDo you want to close the editor anyway?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) ); - } - if(quitnow){ QMainWindow::closeEvent(ev); } - else{ ev->ignore(); } + bool savenow = unsaved.isEmpty(); + if(!savenow && !ui->actionShow_Popups->isChecked()){ savenow = true; } + if(!savenow){ + savenow = (QMessageBox::Yes == QMessageBox::question(this, tr("Save Changes before closing?"), QString(tr("There are unsaved changes.\nDo you want save them before you close the editor?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) ); + } + if(!savenow){ QMainWindow::closeEvent(ev); } + else{ ev->ignore(); SaveFile(); } } diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.ui b/src-qt5/desktop-utils/lumina-textedit/MainUI.ui index de5c1ee1..fec94a21 100644 --- a/src-qt5/desktop-utils/lumina-textedit/MainUI.ui +++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.ui @@ -182,7 +182,7 @@ <x>0</x> <y>0</y> <width>505</width> - <height>21</height> + <height>28</height> </rect> </property> <property name="contextMenuPolicy"> @@ -437,6 +437,11 @@ </property> </action> </widget> + <tabstops> + <tabstop>line_find</tabstop> + <tabstop>line_replace</tabstop> + <tabstop>tool_hideReplaceGroup</tabstop> + </tabstops> <resources/> <connections/> </ui> |