Finish getting the font/size information in-sync with the current tab.

2 files changed, 12 insertions, 1 deletions

diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
index e6c523ee..145c7c7e 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
@@ -347,6 +347,10 @@ void MainUI::tabChanged(){
   //this->setWindowTitle( tabWidget->tabText( tabWidget->currentIndex() ) );
   this->setWindowTitle( (changes ? "*" : "") + tabWidget->tabToolTip( tabWidget->currentIndex() ).section("/",-2) );
   if(!ui->line_find->hasFocus() && !ui->line_replace->hasFocus()){ tabWidget->currentWidget()->setFocus(); }
+  QFont font = cur->document()->defaultFont();
+  //Update the font/size widgets to reflect what is set on this tab
+  fontbox->setCurrentFont(font);
+  fontSizes->setValue( font.pointSize() );
 }
 
 void MainUI::tabClosed(int tab){
diff --git a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
index e62ff0d4..a1b77732 100644
--- a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
@@ -53,7 +53,14 @@ void PlainTextEditor::showLineNumbers(bool show){
 }
 
 void PlainTextEditor::LoadSyntaxRule(QString type){
-  SYNTAX->loadRules(type);
+  QList<SyntaxFile> files = SyntaxFile::availableFiles(settings);
+  for(int i=0; i<files.length(); i++){
+    if(files[i].name() == type){
+      files[i].SetupDocument(this);
+      SYNTAX->loadRules(files[i]);
+      break;
+    }
+  }
   SYNTAX->rehighlight();
 }